Ticket #2134: boost-integer.hpp.diff
File boost-integer.hpp.diff, 3.1 KB (added by , 14 years ago) |
---|
-
boost/integer.hpp
122 122 { 123 123 BOOST_STATIC_CONSTANT( int, rank = 124 124 #ifdef BOOST_HAS_LONG_LONG 125 (MaxValue <= integer_traits< long_long_type >::const_max) +125 (MaxValue <= boost::integer_traits< long_long_type >::const_max) + 126 126 #elif defined(BOOST_HAS_MS_INT64) 127 (MaxValue <= integer_traits< __int64 >::const_max) +127 (MaxValue <= boost::integer_traits< __int64 >::const_max) + 128 128 #else 129 129 1 + 130 130 #endif 131 (MaxValue <= integer_traits< long >::const_max) +132 (MaxValue <= integer_traits< int >::const_max) +133 (MaxValue <= integer_traits< short >::const_max) +134 (MaxValue <= integer_traits< signed char >::const_max) );131 (MaxValue <= boost::integer_traits< long >::const_max) + 132 (MaxValue <= boost::integer_traits< int >::const_max) + 133 (MaxValue <= boost::integer_traits< short >::const_max) + 134 (MaxValue <= boost::integer_traits< signed char >::const_max) ); 135 135 }; 136 136 137 137 template < intmax_t MinValue > … … 139 139 { 140 140 BOOST_STATIC_CONSTANT( int, rank = 141 141 #ifdef BOOST_HAS_LONG_LONG 142 (MinValue >= integer_traits< long_long_type >::const_min) +142 (MinValue >= boost::integer_traits< long_long_type >::const_min) + 143 143 #elif defined(BOOST_HAS_MS_INT64) 144 (MinValue >= integer_traits< __int64 >::const_min) +144 (MinValue >= boost::integer_traits< __int64 >::const_min) + 145 145 #else 146 146 1 + 147 147 #endif 148 (MinValue >= integer_traits< long >::const_min) +149 (MinValue >= integer_traits< int >::const_min) +150 (MinValue >= integer_traits< short >::const_min) +151 (MinValue >= integer_traits< signed char >::const_min) );148 (MinValue >= boost::integer_traits< long >::const_min) + 149 (MinValue >= boost::integer_traits< int >::const_min) + 150 (MinValue >= boost::integer_traits< short >::const_min) + 151 (MinValue >= boost::integer_traits< signed char >::const_min) ); 152 152 }; 153 153 154 154 template < uintmax_t Value > … … 156 156 { 157 157 BOOST_STATIC_CONSTANT( int, rank = 158 158 #ifdef BOOST_HAS_LONG_LONG 159 (Value <= integer_traits< ulong_long_type >::const_max) +159 (Value <= boost::integer_traits< ulong_long_type >::const_max) + 160 160 #elif defined(BOOST_HAS_MS_INT64) 161 (Value <= integer_traits< unsigned __int64 >::const_max) +161 (Value <= boost::integer_traits< unsigned __int64 >::const_max) + 162 162 #else 163 163 1 + 164 164 #endif 165 (Value <= integer_traits< unsigned long >::const_max) +166 (Value <= integer_traits< unsigned int >::const_max) +167 (Value <= integer_traits< unsigned short >::const_max) +168 (Value <= integer_traits< unsigned char >::const_max) );165 (Value <= boost::integer_traits< unsigned long >::const_max) + 166 (Value <= boost::integer_traits< unsigned int >::const_max) + 167 (Value <= boost::integer_traits< unsigned short >::const_max) + 168 (Value <= boost::integer_traits< unsigned char >::const_max) ); 169 169 }; 170 170 171 171 } // namespace detail