diff options
author | Luka Perkov <luka@openwrt.org> | 2013-08-14 23:23:23 +0000 |
---|---|---|
committer | Luka Perkov <luka@openwrt.org> | 2013-08-14 23:23:23 +0000 |
commit | 302004fa88b7a04f1b36df749071aae93bc67167 (patch) | |
tree | acb96d9262c4c376dd923309f493bda9cdcce7a5 /tools/ppl/patches/001-gmp-conflicts.patch | |
parent | 7918a35c119290ec19274718b65bfa71cb65f397 (diff) | |
download | master-187ad058-302004fa88b7a04f1b36df749071aae93bc67167.tar.gz master-187ad058-302004fa88b7a04f1b36df749071aae93bc67167.tar.bz2 master-187ad058-302004fa88b7a04f1b36df749071aae93bc67167.zip |
ppl: upgrade to 1.0
Signed-off-by: Luka Perkov <lperkov@cisco.com>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37786 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'tools/ppl/patches/001-gmp-conflicts.patch')
-rw-r--r-- | tools/ppl/patches/001-gmp-conflicts.patch | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/tools/ppl/patches/001-gmp-conflicts.patch b/tools/ppl/patches/001-gmp-conflicts.patch new file mode 100644 index 0000000000..cf65ee5245 --- /dev/null +++ b/tools/ppl/patches/001-gmp-conflicts.patch @@ -0,0 +1,41 @@ +--- a/src/mp_std_bits.cc ++++ b/src/mp_std_bits.cc +@@ -25,6 +25,9 @@ site: http://bugseng.com/products/ppl/ . */ + #include "ppl-config.h" + #include "mp_std_bits_defs.hh" + ++#if __GNU_MP_VERSION < 5 \ ++ || (__GNU_MP_VERSION == 5 && __GNU_MP_VERSION_MINOR < 1) ++ + const bool std::numeric_limits<mpz_class>::is_specialized; + const int std::numeric_limits<mpz_class>::digits; + const int std::numeric_limits<mpz_class>::digits10; +@@ -70,3 +73,6 @@ const bool std::numeric_limits<mpq_class>::is_modulo; + const bool std::numeric_limits<mpq_class>::traps; + const bool std::numeric_limits<mpq_class>::tininess_before; + const std::float_round_style std::numeric_limits<mpq_class>::round_style; ++ ++#endif // __GNU_MP_VERSION < 5 ++ // || (__GNU_MP_VERSION == 5 && __GNU_MP_VERSION_MINOR < 1) +--- a/src/mp_std_bits.defs.hh ++++ b/src/mp_std_bits.defs.hh +@@ -38,6 +38,9 @@ + #endif // defined(PPL_DOXYGEN_INCLUDE_IMPLEMENTATION_DETAILS) + void swap(mpq_class& x, mpq_class& y); + ++#if __GNU_MP_VERSION < 5 \ ++ || (__GNU_MP_VERSION == 5 && __GNU_MP_VERSION_MINOR < 1) ++ + namespace std { + + #ifdef PPL_DOXYGEN_INCLUDE_IMPLEMENTATION_DETAILS +@@ -164,6 +167,9 @@ + + } // namespace std + ++#endif // __GNU_MP_VERSION < 5 ++ // || (__GNU_MP_VERSION == 5 && __GNU_MP_VERSION_MINOR < 1) ++ + #include "mp_std_bits.inlines.hh" + + #endif // !defined(PPL_mp_std_bits_defs_hh) |