Magellan Linux

Contents of /trunk/ppl/patches/ppl-1.0-gmp51.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 2109 - (show annotations) (download)
Tue Mar 12 08:59:20 2013 UTC (11 years, 7 months ago) by niro
File size: 1712 byte(s)
-build fix against gmp-5.1
1 diff -up ppl-1.0/src/mp_std_bits.cc.orig ppl-1.0/src/mp_std_bits.cc
2 --- ppl-1.0/src/mp_std_bits.cc.orig 2013-01-30 00:54:04.362716243 -0200
3 +++ ppl-1.0/src/mp_std_bits.cc 2013-01-30 00:56:18.260721371 -0200
4 @@ -25,6 +25,9 @@ site: http://bugseng.com/products/ppl/ .
5 #include "ppl-config.h"
6 #include "mp_std_bits.defs.hh"
7
8 +#if __GNU_MP_VERSION < 5 \
9 + || (__GNU_MP_VERSION == 5 && __GNU_MP_VERSION_MINOR < 1)
10 +
11 const bool std::numeric_limits<mpz_class>::is_specialized;
12 const int std::numeric_limits<mpz_class>::digits;
13 const int std::numeric_limits<mpz_class>::digits10;
14 @@ -70,3 +73,6 @@ const bool std::numeric_limits<mpq_class
15 const bool std::numeric_limits<mpq_class>::traps;
16 const bool std::numeric_limits<mpq_class>::tininess_before;
17 const std::float_round_style std::numeric_limits<mpq_class>::round_style;
18 +
19 +#endif // __GNU_MP_VERSION < 5
20 + // || (__GNU_MP_VERSION == 5 && __GNU_MP_VERSION_MINOR < 1)
21 diff -up ppl-1.0/src/mp_std_bits.defs.hh.orig ppl-1.0/src/mp_std_bits.defs.hh
22 --- ppl-1.0/src/mp_std_bits.defs.hh.orig 2013-01-30 00:54:10.339716472 -0200
23 +++ ppl-1.0/src/mp_std_bits.defs.hh 2013-01-30 00:55:45.852720130 -0200
24 @@ -38,6 +38,9 @@ void swap(mpz_class& x, mpz_class& y);
25 #endif // defined(PPL_DOXYGEN_INCLUDE_IMPLEMENTATION_DETAILS)
26 void swap(mpq_class& x, mpq_class& y);
27
28 +#if __GNU_MP_VERSION < 5 \
29 + || (__GNU_MP_VERSION == 5 && __GNU_MP_VERSION_MINOR < 1)
30 +
31 namespace std {
32
33 #ifdef PPL_DOXYGEN_INCLUDE_IMPLEMENTATION_DETAILS
34 @@ -164,6 +167,9 @@ public:
35
36 } // namespace std
37
38 +#endif // __GNU_MP_VERSION < 5
39 + // || (__GNU_MP_VERSION == 5 && __GNU_MP_VERSION_MINOR < 1)
40 +
41 #include "mp_std_bits.inlines.hh"
42
43 #endif // !defined(PPL_mp_std_bits_defs_hh)