From 95a52b2d34d7bd65e58145e30436c4e88b8b777f Mon Sep 17 00:00:00 2001
From: Ray Speth <speth@mit.edu>
Date: Thu, 23 Feb 2017 22:12:34 -0500
Subject: [PATCH] [Test] Fix test compilation with G++ 4.6

G++ 4.6 doesn't support non-static data member initializers
---
 test/thermo/MaskellSolidSolnPhase_Test.cpp |  7 +++---
 test/thermo/RedlichKisterTest.cpp          | 25 +++++++++++-----------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/test/thermo/MaskellSolidSolnPhase_Test.cpp b/test/thermo/MaskellSolidSolnPhase_Test.cpp
index abf592923..9b3661b3f 100644
--- a/test/thermo/MaskellSolidSolnPhase_Test.cpp
+++ b/test/thermo/MaskellSolidSolnPhase_Test.cpp
@@ -9,6 +9,10 @@
 namespace Cantera
 {
 
+static const double expected_result_0[9] = {1.2338461168724738e7, 8.011774549216799e6, 4.990989640314685e6, 2.415973128783114e6, 0., -2.415973128783114e6, -4.99098964031469e6, -8.0117745492168e6, -1.2338461168724738e7};
+static const double expected_result_5000[9] = { 1.233625377465302e7, 8.00995666545047e6, 4.989677478024063e6, 2.41528026460977e6, 0., -2.415280264609771e6, -4.989677478024068e6, -8.00995666545047e6, -1.233625377465302e7 };
+static const double expected_result_minus_5000[9] = { 1.2340671035887627e7, 8.013594700219031e6, 4.992303607179179e6, 2.4166670154679064e6, 0., -2.4166670154679064e6, -4.9923036071791835e6, -8.013594700219034e6, -1.2340671035887627e7};
+
 class MaskellSolidSolnPhase_Test : public testing::Test
 {
 public:
@@ -38,9 +42,6 @@ public:
     }
 
     std::unique_ptr<ThermoPhase> test_phase;
-    const double expected_result_0[9] = {1.2338461168724738e7, 8.011774549216799e6, 4.990989640314685e6, 2.415973128783114e6, 0., -2.415973128783114e6, -4.99098964031469e6, -8.0117745492168e6, -1.2338461168724738e7};
-    const double expected_result_5000[9] = { 1.233625377465302e7, 8.00995666545047e6, 4.989677478024063e6, 2.41528026460977e6, 0., -2.415280264609771e6, -4.989677478024068e6, -8.00995666545047e6, -1.233625377465302e7 };
-    const double expected_result_minus_5000[9] = { 1.2340671035887627e7, 8.013594700219031e6, 4.992303607179179e6, 2.4166670154679064e6, 0., -2.4166670154679064e6, -4.9923036071791835e6, -8.013594700219034e6, -1.2340671035887627e7};
 };
 
 TEST_F(MaskellSolidSolnPhase_Test, construct_from_xml)
diff --git a/test/thermo/RedlichKisterTest.cpp b/test/thermo/RedlichKisterTest.cpp
index 4543564f3..b4551855d 100644
--- a/test/thermo/RedlichKisterTest.cpp
+++ b/test/thermo/RedlichKisterTest.cpp
@@ -8,6 +8,18 @@
 namespace Cantera
 {
 
+static const double expected_chempot[9] = {
+    -1.2791500420236044e+007,
+    -1.2618554504124604e+007,
+    -1.2445418272766629e+007,
+    -1.2282611679165890e+007,
+    -1.2134110753109487e+007,
+    -1.1999465396970615e+007,
+    -1.1882669410525253e+007,
+    -1.1792994839484975e+007,
+    -1.1730895987035934e+007
+};
+
 class RedlichKister_Test : public testing::Test
 {
 public:
@@ -25,19 +37,6 @@ public:
     }
 
     std::unique_ptr<ThermoPhase> test_phase;
-
-    const double expected_chempot[9] = {
-        -1.2791500420236044e+007,
-        -1.2618554504124604e+007,
-        -1.2445418272766629e+007,
-        -1.2282611679165890e+007,
-        -1.2134110753109487e+007,
-        -1.1999465396970615e+007,
-        -1.1882669410525253e+007,
-        -1.1792994839484975e+007,
-        -1.1730895987035934e+007
-    };
-
 };
 
 TEST_F(RedlichKister_Test, construct_from_xml)