patches/ppl/0.11.2/400-fix-build-with-gmp-5.1.patch
author Bernhard Walle <bernhard@bwalle.de>
Sun May 11 13:00:36 2014 +0200 (2014-05-11)
changeset 3318 579bc9107f99
permissions -rw-r--r--
complibs/ppl: Fix build of ppl 0.11.2 with gcc 4.9

From: Roberto Bagnara <bagnara@cs.unipr.it>
Date: Tue, 29 Apr 2014 19:51:43 +0000 (+0200)
Subject: Added missing inclusions. Use std::ptrdiff_t.
X-Git-Url: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl%2Fppl.git;a=commitdiff;h=61d4e14dfd9f1121e9b4521dead5728b2424dd7c

Added missing inclusions. Use std::ptrdiff_t.
(Thanks to Paulo Cesar Pereira de Andrade.)

Signed-off-by: Bernhard Walle <bernhard@bwalle.de>
Message-Id: <5632a171e7c1dc4c0fb5.1399806148@euler.fritz.box>
Patchwork-Id: 347777
bernhard@3253
     1
From 9f843aecc23981aec6ed1eaa8be06e6786a47f0d Mon Sep 17 00:00:00 2001
bernhard@3253
     2
From: Roberto Bagnara <bagnara@cs.unipr.it>
bernhard@3253
     3
Date: Wed, 19 Dec 2012 08:42:19 +0100
bernhard@3253
     4
Subject: [PATCH] GMP version 5.1.0 (and, presumably, later versions) defines
bernhard@3253
     5
 std::numeric_limits.
bernhard@3253
     6
bernhard@3253
     7
---
bernhard@3253
     8
 src/mp_std_bits.cc      |    6 ++++++
bernhard@3253
     9
 src/mp_std_bits.defs.hh |    6 ++++++
bernhard@3253
    10
 2 files changed, 12 insertions(+)
bernhard@3253
    11
bernhard@3253
    12
--- a/src/mp_std_bits.cc
bernhard@3253
    13
+++ b/src/mp_std_bits.cc
bernhard@3253
    14
@@ -26,6 +26,9 @@ site: http://www.cs.unipr.it/ppl/ . */
bernhard@3253
    15
 #include <ppl-config.h>
bernhard@3253
    16
 #include "mp_std_bits.defs.hh"
bernhard@3253
    17
 
bernhard@3253
    18
+#if __GNU_MP_VERSION < 5 \
bernhard@3253
    19
+  || (__GNU_MP_VERSION == 5 && __GNU_MP_VERSION_MINOR < 1)
bernhard@3253
    20
+
bernhard@3253
    21
 const bool std::numeric_limits<mpz_class>::is_specialized;
bernhard@3253
    22
 const int std::numeric_limits<mpz_class>::digits;
bernhard@3253
    23
 const int std::numeric_limits<mpz_class>::digits10;
bernhard@3253
    24
@@ -71,3 +74,6 @@ const bool std::numeric_limits<mpq_class
bernhard@3253
    25
 const bool std::numeric_limits<mpq_class>::traps;
bernhard@3253
    26
 const bool std::numeric_limits<mpq_class>::tininess_before;
bernhard@3253
    27
 const std::float_round_style std::numeric_limits<mpq_class>::round_style;
bernhard@3253
    28
+
bernhard@3253
    29
+#endif // __GNU_MP_VERSION < 5
bernhard@3253
    30
+       // || (__GNU_MP_VERSION == 5 && __GNU_MP_VERSION_MINOR < 1)
bernhard@3253
    31
--- a/src/mp_std_bits.defs.hh
bernhard@3253
    32
+++ b/src/mp_std_bits.defs.hh
bernhard@3253
    33
@@ -39,6 +39,9 @@ void swap(mpz_class& x, mpz_class& y);
bernhard@3253
    34
 #endif // defined(PPL_DOXYGEN_INCLUDE_IMPLEMENTATION_DETAILS)
bernhard@3253
    35
 void swap(mpq_class& x, mpq_class& y);
bernhard@3253
    36
 
bernhard@3253
    37
+#if __GNU_MP_VERSION < 5 \
bernhard@3253
    38
+  || (__GNU_MP_VERSION == 5 && __GNU_MP_VERSION_MINOR < 1)
bernhard@3253
    39
+
bernhard@3253
    40
 namespace std {
bernhard@3253
    41
 
bernhard@3253
    42
 #ifdef PPL_DOXYGEN_INCLUDE_IMPLEMENTATION_DETAILS
bernhard@3253
    43
@@ -165,6 +168,9 @@ public:
bernhard@3253
    44
 
bernhard@3253
    45
 } // namespace std
bernhard@3253
    46
 
bernhard@3253
    47
+#endif // __GNU_MP_VERSION < 5
bernhard@3253
    48
+       // || (__GNU_MP_VERSION == 5 && __GNU_MP_VERSION_MINOR < 1)
bernhard@3253
    49
+
bernhard@3253
    50
 #include "mp_std_bits.inlines.hh"
bernhard@3253
    51
 
bernhard@3253
    52
 #endif // !defined(PPL_mp_std_bits_defs_hh)