diff options
| author | DongHun Kwak <dh0128.kwak@samsung.com> | 2017-09-13 11:24:46 +0900 |
|---|---|---|
| committer | DongHun Kwak <dh0128.kwak@samsung.com> | 2017-09-13 11:25:39 +0900 |
| commit | 4fadd968fa12130524c8380f33fcfe25d4de79e5 (patch) | |
| tree | fd26a490cd15388d42fc6652b3c5c13012e7f93e /boost/multiprecision/cpp_dec_float.hpp | |
| parent | b5c87084afaef42b2d058f68091be31988a6a874 (diff) | |
| download | boost-upstream/1.65.0.tar.gz boost-upstream/1.65.0.tar.bz2 boost-upstream/1.65.0.zip | |
Imported Upstream version 1.65.0upstream/1.65.0
Change-Id: Icf8400b375482cb11bcf77440a6934ba360d6ba4
Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>
Diffstat (limited to 'boost/multiprecision/cpp_dec_float.hpp')
| -rw-r--r-- | boost/multiprecision/cpp_dec_float.hpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/boost/multiprecision/cpp_dec_float.hpp b/boost/multiprecision/cpp_dec_float.hpp index f9e6a22189..6e1509289d 100644 --- a/boost/multiprecision/cpp_dec_float.hpp +++ b/boost/multiprecision/cpp_dec_float.hpp @@ -255,7 +255,11 @@ public: } template <class F> - cpp_dec_float(const F val, typename enable_if<is_floating_point<F> >::type* = 0) : + cpp_dec_float(const F val, typename enable_if_c<is_floating_point<F>::value +#ifdef BOOST_HAS_FLOAT128 + && !boost::is_same<F, __float128>::value +#endif + >::type* = 0) : data(), exp (static_cast<ExponentType>(0)), neg (false), @@ -2892,7 +2896,7 @@ template <unsigned Digits10, class ExponentType, class Allocator, class ArgType> inline void eval_scalbn(cpp_dec_float<Digits10, ExponentType, Allocator>& result, const cpp_dec_float<Digits10, ExponentType, Allocator>& val, ArgType e_) { using default_ops::eval_multiply; - const ExponentType e = e_; + const ExponentType e = static_cast<ExponentType>(e_); cpp_dec_float<Digits10, ExponentType, Allocator> t(1.0, e); eval_multiply(result, val, t); } |