Petr Machata c3593a
diff -up boost/lexical_cast.hpp\~ boost/lexical_cast.hpp
Petr Machata c3593a
--- boost/lexical_cast.hpp~	2013-07-27 12:03:21.000000000 +0200
Petr Machata c3593a
+++ boost/lexical_cast.hpp	2013-07-30 19:30:54.969548144 +0200
Petr Machata c3593a
@@ -69,11 +69,6 @@
Petr Machata c3593a
     throw_exception(bad_lexical_cast(typeid(Source), typeid(Target)))
Petr Machata c3593a
 #endif
Petr Machata c3593a
 
Petr Machata c3593a
-#if (defined(BOOST_LCAST_HAS_INT128) && !defined(__GNUC__)) || GCC_VERSION > 40700
Petr Machata c3593a
-#define BOOST_LCAST_HAS_INT128
Petr Machata c3593a
-#endif
Petr Machata c3593a
-
Petr Machata c3593a
-
Petr Machata c3593a
 namespace boost
Petr Machata c3593a
 {
Petr Machata c3593a
     // exception used to indicate runtime lexical_cast failure
Petr Machata c3593a
@@ -316,7 +311,7 @@ namespace boost {
Petr Machata c3593a
         > {};
Petr Machata c3593a
 #endif
Petr Machata c3593a
 
Petr Machata c3593a
-#ifdef BOOST_LCAST_HAS_INT128
Petr Machata c3593a
+#ifdef BOOST_HAS_INT128
Petr Machata c3593a
         template <> struct stream_char_common< boost::int128_type >: public boost::mpl::identity< char > {};
Petr Machata c3593a
         template <> struct stream_char_common< boost::uint128_type >: public boost::mpl::identity< char > {};
Petr Machata c3593a
 #endif
Petr Machata c3593a
@@ -613,7 +608,7 @@ namespace boost {
Petr Machata c3593a
         BOOST_LCAST_DEF(unsigned __int64)
Petr Machata c3593a
         BOOST_LCAST_DEF(         __int64)
Petr Machata c3593a
 #endif
Petr Machata c3593a
-#ifdef BOOST_LCAST_HAS_INT128
Petr Machata c3593a
+#ifdef BOOST_HAS_INT128
Petr Machata c3593a
         BOOST_LCAST_DEF(boost::int128_type)
Petr Machata c3593a
         BOOST_LCAST_DEF(boost::uint128_type)
Petr Machata c3593a
 #endif
Petr Machata c3593a
@@ -1827,7 +1822,7 @@ namespace boost {
Petr Machata c3593a
             bool operator<<(         __int64 n)         { return shl_signed(n); }
Petr Machata c3593a
 #endif
Petr Machata c3593a
 
Petr Machata c3593a
-#ifdef BOOST_LCAST_HAS_INT128
Petr Machata c3593a
+#ifdef BOOST_HAS_INT128
Petr Machata c3593a
         bool operator<<(const boost::uint128_type& n)   { start = lcast_put_unsigned<Traits>(n, finish); return true; }
Petr Machata c3593a
         bool operator<<(const boost::int128_type& n)    { return shl_signed(n); }
Petr Machata c3593a
 #endif
Petr Machata c3593a
@@ -2039,7 +2034,7 @@ namespace boost {
Petr Machata c3593a
             bool operator>>(__int64& output)                    { return shr_signed(output); }
Petr Machata c3593a
 #endif
Petr Machata c3593a
 
Petr Machata c3593a
-#ifdef BOOST_LCAST_HAS_INT128
Petr Machata c3593a
+#ifdef BOOST_HAS_INT128
Petr Machata c3593a
             bool operator>>(boost::uint128_type& output)        { return shr_unsigned(output); }
Petr Machata c3593a
             bool operator>>(boost::int128_type& output)         { return shr_signed(output); }
Petr Machata c3593a
 #endif
Petr Machata c3593a
@@ -2719,7 +2714,6 @@ namespace boost {
Petr Machata c3593a
 
Petr Machata c3593a
 #undef BOOST_LCAST_THROW_BAD_CAST
Petr Machata c3593a
 #undef BOOST_LCAST_NO_WCHAR_T
Petr Machata c3593a
-#undef BOOST_LCAST_HAS_INT128
Petr Machata c3593a
 
Petr Machata c3593a
 #endif // BOOST_LEXICAL_CAST_INCLUDED
Petr Machata c3593a
 
Petr Machata c3593a
Petr Machata c3593a
Diff finished.  Tue Jul 30 19:30:58 2013