X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=stage0%2Fpatches%2Fcommon%2Fppl-0.12.1-resolve-conflicts-with-gmp-5.1.0.patch;fp=stage0%2Fpatches%2Fcommon%2Fppl-0.12.1-resolve-conflicts-with-gmp-5.1.0.patch;h=0000000000000000000000000000000000000000;hb=6890ab467c34bc0ae1fccf18a521c3cedfa442a2;hp=47edc8bf1ad0cfa5953b62ae819b648388f8e39d;hpb=ef84c8b410182cbcde3e4b4565363258edc50a3a;p=hvlinux.git

diff --git a/stage0/patches/common/ppl-0.12.1-resolve-conflicts-with-gmp-5.1.0.patch b/stage0/patches/common/ppl-0.12.1-resolve-conflicts-with-gmp-5.1.0.patch
deleted file mode 100644
index 47edc8b..0000000
--- a/stage0/patches/common/ppl-0.12.1-resolve-conflicts-with-gmp-5.1.0.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-Module: ppl/ppl
-Branch: master
-Commit: 9f843aecc23981aec6ed1eaa8be06e6786a47f0d
-URL:    http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=9f843aecc23981aec6ed1eaa8be06e6786a47f0d
-
-Author: Roberto Bagnara <bagnara at cs.unipr.it>
-Date:   Wed Dec 19 08:42:19 2012 +0100
-
-GMP version 5.1.0 (and, presumably, later versions) defines std::numeric_limits.
-
----
-
- src/mp_std_bits.cc      |    6 ++++++
- src/mp_std_bits.defs.hh |    6 ++++++
- 2 files changed, 12 insertions(+), 0 deletions(-)
-
-diff --git a/src/mp_std_bits.cc b/src/mp_std_bits.cc
-index c8da535..918b9af 100644
---- 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)
-diff --git a/src/mp_std_bits.defs.hh b/src/mp_std_bits.defs.hh
-index f71595a..0d078ec 100644 (file)
---- 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)