Fixes for stricter compilers Andy brought to my attention.

diff --git a/test/unit/util/integer_white.h b/test/unit/util/integer_white.h
index 19281d74571926bea9c00f90f45c1d6e01d7303d..32db6fd8373055bd85e2ca7fe611f7515580ecd5 100644 (file)
--- a/test/unit/util/integer_white.h
+++ b/test/unit/util/integer_white.h
@@ -43,9 +43,9 @@ public:
 
   //Make sure we can properly handle:
   //http://www.ginac.de/CLN/cln_3.html#SEC15
-  const int i_above2tothe29 = (1 << 29) + 1;
-  const unsigned int u_above2tothe29 = (1 << 29) + 1;
   void testConstruction(){
+    const int i_above2tothe29 = (1 << 29) + 1;
+    const unsigned int u_above2tothe29 = (1 << 29) + 1;
     TS_ASSERT_EQUALS(Integer(i_above2tothe29), Integer((long)i_above2tothe29));
     TS_ASSERT_EQUALS(Integer(u_above2tothe29),
                      Integer((unsigned long)u_above2tothe29));

diff --git a/test/unit/util/rational_white.h b/test/unit/util/rational_white.h
index 63b4e18435a8af46923556c39dba3bdd4e7a1e09..be5b9f0448ccc11cbd7090418a168657d9a21cec 100644 (file)
--- a/test/unit/util/rational_white.h
+++ b/test/unit/util/rational_white.h
@@ -433,9 +433,9 @@ public:
 
   //Make sure we can properly handle:
   //http://www.ginac.de/CLN/cln_3.html#SEC15
-  const int i_above2tothe29 = (1 << 29) + 1;
-  const unsigned int u_above2tothe29 = (1 << 29) + 1;
   void testConstruction(){
+    const int i_above2tothe29 = (1 << 29) + 1;
+    const unsigned int u_above2tothe29 = (1 << 29) + 1;
     TS_ASSERT_EQUALS(Rational(i_above2tothe29), Rational((long)i_above2tothe29));
     TS_ASSERT_EQUALS(Rational(u_above2tothe29),
                      Rational((unsigned long)u_above2tothe29));