diff options
| author | Junfeng Dong <junfeng.dong@intel.com> | 2014-01-15 17:10:53 +0800 |
|---|---|---|
| committer | Junfeng Dong <junfeng.dong@intel.com> | 2014-01-15 17:10:53 +0800 |
| commit | a0aad599d383f3ebfc6db0eef4101050cb00b9d5 (patch) | |
| tree | 818c65c6cf080279ac7a4d53b035c9495cdc9f70 | |
| parent | 45d013e7f198300c47d2db36b212d8e0f5bbd438 (diff) | |
| download | ppl-a0aad599d383f3ebfc6db0eef4101050cb00b9d5.tar.gz ppl-a0aad599d383f3ebfc6db0eef4101050cb00b9d5.tar.bz2 ppl-a0aad599d383f3ebfc6db0eef4101050cb00b9d5.zip | |
Module: ppl/ppltizen_3.0.m14.2_ivi_releasesubmit/tizen_ivi_release/20140317.185439submit/tizen_ivi_release/20140315.035339submit/tizen_ivi_panda/20140403.012056submit/tizen/20140310.064944accepted/tizen/mobile/20140311.003543accepted/tizen/ivi/release/20140317.185212accepted/tizen/ivi/release/20140315.035453accepted/tizen/ivi/panda/20140403.014150accepted/tizen/ivi/20140310.173459accepted/tizen/generic/20140310.073612tizen_ivi_releasetizen_ivi_pandatizen_3.0.m14.2_iviaccepted/tizen_ivi_releaseaccepted/tizen_ivi_pandaaccepted/tizen_generic
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.
Change-Id: I0012c15f9cbe64c736ede1c99f83dc8d5911648a
Signed-off-by: Junfeng Dong <junfeng.dong@intel.com>
| -rw-r--r-- | src/mp_std_bits.cc | 6 | ||||
| -rw-r--r-- | src/mp_std_bits.defs.hh | 5 |
2 files changed, 11 insertions, 0 deletions
diff --git a/src/mp_std_bits.cc b/src/mp_std_bits.cc index d79dca876..e07714a94 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 <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; @@ -71,3 +74,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 aaedd9fa0..ce97419c7 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) |