diff options
| author | DongHun Kwak <dh0128.kwak@samsung.com> | 2016-10-06 10:30:07 +0900 |
|---|---|---|
| committer | DongHun Kwak <dh0128.kwak@samsung.com> | 2016-10-06 10:32:57 +0900 |
| commit | 71d216b90256936a9638f325af9bc69d720e75de (patch) | |
| tree | 9c5f682d341c7c88ad0c8e3d4b262e00b6fb691a /boost/units | |
| parent | 733b5d5ae2c5d625211e2985ac25728ac3f54883 (diff) | |
| download | boost-71d216b90256936a9638f325af9bc69d720e75de.tar.gz boost-71d216b90256936a9638f325af9bc69d720e75de.tar.bz2 boost-71d216b90256936a9638f325af9bc69d720e75de.zip | |
Imported Upstream version 1.59.0
Change-Id: I2dde00f4eca71df3eea9d251dcaecde18a6c90a5
Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>
Diffstat (limited to 'boost/units')
| -rw-r--r-- | boost/units/scaled_base_unit.hpp | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/boost/units/scaled_base_unit.hpp b/boost/units/scaled_base_unit.hpp index 201de5e85d..24f9f4f6b6 100644 --- a/boost/units/scaled_base_unit.hpp +++ b/boost/units/scaled_base_unit.hpp @@ -16,8 +16,6 @@ #include <boost/mpl/bool.hpp> #include <boost/mpl/less.hpp> #include <boost/type_traits/is_same.hpp> -#include <boost/type_traits/detail/ice_and.hpp> -#include <boost/type_traits/detail/ice_or.hpp> #include <boost/units/config.hpp> #include <boost/units/dimension.hpp> @@ -110,8 +108,8 @@ struct less_impl<boost::units::scaled_base_unit_tag, Tag> { template<class T0, class T1> struct apply : mpl::bool_< - boost::type_traits::ice_or<(mpl::less<typename T0::system_type, T1>::value), - (boost::type_traits::ice_and<boost::is_same<typename T0::system_type, T1>::value, (T0::scale_type::exponent::Numerator) < 0>::value)>::value> {}; + mpl::less<typename T0::system_type, T1>::value || + (boost::is_same<typename T0::system_type, T1>::value && ((T0::scale_type::exponent::Numerator) < 0)) > {}; }; /// INTERNAL ONLY @@ -120,8 +118,8 @@ struct less_impl<Tag, boost::units::scaled_base_unit_tag> { template<class T0, class T1> struct apply : mpl::bool_< - boost::type_traits::ice_or<(mpl::less<T0, typename T1::system_type>::value), - boost::type_traits::ice_and<(boost::is_same<T0, typename T1::system_type>::value), ((T1::scale_type::exponent::Numerator) > 0)>::value>::value> {}; + mpl::less<T0, typename T1::system_type>::value || + (boost::is_same<T0, typename T1::system_type>::value && ((T1::scale_type::exponent::Numerator) > 0)) > {}; }; /// INTERNAL ONLY @@ -130,11 +128,11 @@ struct less_impl<boost::units::scaled_base_unit_tag, boost::units::scaled_base_u { template<class T0, class T1> struct apply : mpl::bool_< - boost::type_traits::ice_or<(mpl::less<typename T0::system_type, typename T1::system_type>::value), - boost::type_traits::ice_and<(boost::is_same<typename T0::system_type, typename T1::system_type>::value), - boost::type_traits::ice_or<((T0::scale_type::base) < (T1::scale_type::base)), - boost::type_traits::ice_and<((T0::scale_type::base) == (T1::scale_type::base)), - (mpl::less<typename T0::scale_type::exponent,typename T1::scale_type::exponent>::value)>::value>::value>::value>::value> {}; + mpl::less<typename T0::system_type, typename T1::system_type>::value || + ((boost::is_same<typename T0::system_type, typename T1::system_type>::value) && + ((T0::scale_type::base) < (T1::scale_type::base) || + ((T0::scale_type::base) == (T1::scale_type::base) && + mpl::less<typename T0::scale_type::exponent, typename T1::scale_type::exponent>::value))) > {}; }; } // namespace mpl |