boost/multiprecision
2
0
Fork 0
mirror of https://github.com/boostorg/multiprecision.git synced 2026-02-20 02:42:26 +00:00
Code Issues Projects Releases Wiki Activity

Fix GCC-4.6.x support which was broken in last commit. Refs #8292

Browse Source 
[SVN r83459]
This commit is contained in:
John Maddock
2013-03-16 12:00:01 +00:00
parent e5c96aada3
commit bc193d7add
1 changed files with 16 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
include/boost/multiprecision/number.hpp
View File

@@ -538,22 +538,6 @@ public:
eval_bitwise_xor(m_backend, canonical_value(v));
return *this;
}
//
// Use in boolean context:
//
#ifndef BOOST_NO_CXX11_EXPLICIT_CONVERSION_OPERATORS
BOOST_MP_FORCEINLINE explicit operator bool()const
{
return !is_zero();
}
#else
typedef bool (self_type::*unmentionable_type)()const;
BOOST_MP_FORCEINLINE operator unmentionable_type()const
{
return is_zero() ? 0 : &self_type::is_zero;
}
#endif
//
// swap:
//
@@ -605,8 +589,11 @@ public:
convert_to_imp(&result);
return result;
}
//
// Use in boolean context, and explicit conversion operators:
//
#ifndef BOOST_NO_CXX11_EXPLICIT_CONVERSION_OPERATORS
#if defined(__GNUC__) && (__GNUC__ == 4) && (__GNUC_MINOR__ < 7)
# if defined(__GNUC__) && (__GNUC__ == 4) && (__GNUC_MINOR__ < 7)
//
// Horrible workaround for gcc-4.6.x which always prefers the template
// operator bool() rather than the non-template operator when converting to
@@ -623,20 +610,25 @@ public:
{
return this->template convert_to<T>();
}
#else
# else
template <class T>
explicit operator T()const
{
return this->template convert_to<T>();
}
/*
explicit operator bool()const
BOOST_MP_FORCEINLINE explicit operator bool()const
{
using default_ops::eval_is_zero;
return !eval_is_zero(backend());
}*/
return !is_zero();
}
explicit operator void()const {}
#endif
# endif
#else
typedef bool (self_type::*unmentionable_type)()const;
BOOST_MP_FORCEINLINE operator unmentionable_type()const
{
return is_zero() ? 0 : &self_type::is_zero;
}
#endif
//
// Default precision: