From a0aad599d383f3ebfc6db0eef4101050cb00b9d5 Mon Sep 17 00:00:00 2001 From: Junfeng Dong Date: Wed, 15 Jan 2014 17:10:53 +0800 Subject: [PATCH] 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 Date: Wed Dec 19 08:42:19 2012 +0100 GMP version 5.1.0 (and, presumably, later versions) defines std::numeric_limits. Change-Id: I0012c15f9cbe64c736ede1c99f83dc8d5911648a Signed-off-by: Junfeng Dong --- src/mp_std_bits.cc | 6 ++++++ src/mp_std_bits.defs.hh | 5 +++++ 2 files changed, 11 insertions(+) diff --git a/src/mp_std_bits.cc b/src/mp_std_bits.cc index d79dca8..e07714a 100644 --- a/src/mp_std_bits.cc +++ b/src/mp_std_bits.cc @@ -26,6 +26,9 @@ site: http://www.cs.unipr.it/ppl/ . */ #include #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::is_specialized; const int std::numeric_limits::digits; const int std::numeric_limits::digits10; @@ -71,3 +74,6 @@ const bool std::numeric_limits::is_modulo; const bool std::numeric_limits::traps; const bool std::numeric_limits::tininess_before; const std::float_round_style std::numeric_limits::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 aaedd9f..ce97419 100644 --- a/src/mp_std_bits.defs.hh +++ b/src/mp_std_bits.defs.hh @@ -39,6 +39,8 @@ void swap(mpz_class& x, mpz_class& y); #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 @@ -165,6 +167,9 @@ public: } // 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) -- 2.7.4