]> git.pld-linux.org Git - packages/boost.git/blob - boost-1.54.0-lexical_cast-int128.patch
- rel 3; bunch of upstream patches (taken and filtered by FC team)
[packages/boost.git] / boost-1.54.0-lexical_cast-int128.patch
1 diff -up boost/lexical_cast.hpp\~ boost/lexical_cast.hpp
2 --- boost/lexical_cast.hpp~     2013-07-27 12:03:21.000000000 +0200
3 +++ boost/lexical_cast.hpp      2013-07-30 19:30:54.969548144 +0200
4 @@ -69,11 +69,6 @@
5      throw_exception(bad_lexical_cast(typeid(Source), typeid(Target)))
6  #endif
7  
8 -#if (defined(BOOST_LCAST_HAS_INT128) && !defined(__GNUC__)) || GCC_VERSION > 40700
9 -#define BOOST_LCAST_HAS_INT128
10 -#endif
11 -
12 -
13  namespace boost
14  {
15      // exception used to indicate runtime lexical_cast failure
16 @@ -316,7 +311,7 @@ namespace boost {
17          > {};
18  #endif
19  
20 -#ifdef BOOST_LCAST_HAS_INT128
21 +#ifdef BOOST_HAS_INT128
22          template <> struct stream_char_common< boost::int128_type >: public boost::mpl::identity< char > {};
23          template <> struct stream_char_common< boost::uint128_type >: public boost::mpl::identity< char > {};
24  #endif
25 @@ -613,7 +608,7 @@ namespace boost {
26          BOOST_LCAST_DEF(unsigned __int64)
27          BOOST_LCAST_DEF(         __int64)
28  #endif
29 -#ifdef BOOST_LCAST_HAS_INT128
30 +#ifdef BOOST_HAS_INT128
31          BOOST_LCAST_DEF(boost::int128_type)
32          BOOST_LCAST_DEF(boost::uint128_type)
33  #endif
34 @@ -1827,7 +1822,7 @@ namespace boost {
35              bool operator<<(         __int64 n)         { return shl_signed(n); }
36  #endif
37  
38 -#ifdef BOOST_LCAST_HAS_INT128
39 +#ifdef BOOST_HAS_INT128
40          bool operator<<(const boost::uint128_type& n)   { start = lcast_put_unsigned<Traits>(n, finish); return true; }
41          bool operator<<(const boost::int128_type& n)    { return shl_signed(n); }
42  #endif
43 @@ -2039,7 +2034,7 @@ namespace boost {
44              bool operator>>(__int64& output)                    { return shr_signed(output); }
45  #endif
46  
47 -#ifdef BOOST_LCAST_HAS_INT128
48 +#ifdef BOOST_HAS_INT128
49              bool operator>>(boost::uint128_type& output)        { return shr_unsigned(output); }
50              bool operator>>(boost::int128_type& output)         { return shr_signed(output); }
51  #endif
52 @@ -2719,7 +2714,6 @@ namespace boost {
53  
54  #undef BOOST_LCAST_THROW_BAD_CAST
55  #undef BOOST_LCAST_NO_WCHAR_T
56 -#undef BOOST_LCAST_HAS_INT128
57  
58  #endif // BOOST_LEXICAL_CAST_INCLUDED
59  
60
61 Diff finished.  Tue Jul 30 19:30:58 2013
This page took 0.054218 seconds and 4 git commands to generate.