diff -up boost/lexical_cast.hpp\~ boost/lexical_cast.hpp
old
|
new
|
|
69 | 69 | throw_exception(bad_lexical_cast(typeid(Source), typeid(Target))) |
70 | 70 | #endif |
71 | 71 | |
72 | | #if (defined(BOOST_LCAST_HAS_INT128) && !defined(__GNUC__)) || GCC_VERSION > 40700 |
73 | | #define BOOST_LCAST_HAS_INT128 |
74 | | #endif |
75 | | |
76 | | |
77 | 72 | namespace boost |
78 | 73 | { |
79 | 74 | // exception used to indicate runtime lexical_cast failure |
… |
… |
namespace boost {
|
316 | 311 | > {}; |
317 | 312 | #endif |
318 | 313 | |
319 | | #ifdef BOOST_LCAST_HAS_INT128 |
| 314 | #ifdef BOOST_HAS_INT128 |
320 | 315 | template <> struct stream_char_common< boost::int128_type >: public boost::mpl::identity< char > {}; |
321 | 316 | template <> struct stream_char_common< boost::uint128_type >: public boost::mpl::identity< char > {}; |
322 | 317 | #endif |
… |
… |
namespace boost {
|
613 | 608 | BOOST_LCAST_DEF(unsigned __int64) |
614 | 609 | BOOST_LCAST_DEF( __int64) |
615 | 610 | #endif |
616 | | #ifdef BOOST_LCAST_HAS_INT128 |
| 611 | #ifdef BOOST_HAS_INT128 |
617 | 612 | BOOST_LCAST_DEF(boost::int128_type) |
618 | 613 | BOOST_LCAST_DEF(boost::uint128_type) |
619 | 614 | #endif |
… |
… |
namespace boost {
|
1827 | 1822 | bool operator<<( __int64 n) { return shl_signed(n); } |
1828 | 1823 | #endif |
1829 | 1824 | |
1830 | | #ifdef BOOST_LCAST_HAS_INT128 |
| 1825 | #ifdef BOOST_HAS_INT128 |
1831 | 1826 | bool operator<<(const boost::uint128_type& n) { start = lcast_put_unsigned<Traits>(n, finish); return true; } |
1832 | 1827 | bool operator<<(const boost::int128_type& n) { return shl_signed(n); } |
1833 | 1828 | #endif |
… |
… |
namespace boost {
|
2039 | 2034 | bool operator>>(__int64& output) { return shr_signed(output); } |
2040 | 2035 | #endif |
2041 | 2036 | |
2042 | | #ifdef BOOST_LCAST_HAS_INT128 |
| 2037 | #ifdef BOOST_HAS_INT128 |
2043 | 2038 | bool operator>>(boost::uint128_type& output) { return shr_unsigned(output); } |
2044 | 2039 | bool operator>>(boost::int128_type& output) { return shr_signed(output); } |
2045 | 2040 | #endif |
… |
… |
namespace boost {
|
2719 | 2714 | |
2720 | 2715 | #undef BOOST_LCAST_THROW_BAD_CAST |
2721 | 2716 | #undef BOOST_LCAST_NO_WCHAR_T |
2722 | | #undef BOOST_LCAST_HAS_INT128 |
2723 | 2717 | |
2724 | 2718 | #endif // BOOST_LEXICAL_CAST_INCLUDED |
2725 | 2719 | |