[Test] Fix compilation errors with VS2015

Cantera · Sep 8, 2015 · 5ed6d9a · 5ed6d9a
1 parent 67172cd
commit 5ed6d9a
Show file tree

Hide file tree

Showing 22 changed files with 22 additions and 22 deletions.
diff --git a/test_problems/ChemEquil_ionizedGas/ionizedGasEquil.cpp b/test_problems/ChemEquil_ionizedGas/ionizedGasEquil.cpp
@@ -7,7 +7,7 @@ using namespace Cantera;
 
 int main(int argc, char** argv)
 {
-#ifdef _MSC_VER
+#if defined(_MSC_VER) && _MSC_VER < 1900
     _set_output_format(_TWO_DIGIT_EXPONENT);
 #endif
     try {

diff --git a/test_problems/CpJump/CpJump.cpp b/test_problems/CpJump/CpJump.cpp
@@ -9,7 +9,7 @@ using namespace Cantera;
 
 int main(int argc, char** argv)
 {
-#ifdef _MSC_VER
+#if defined(_MSC_VER) && _MSC_VER < 1900
     _set_output_format(_TWO_DIGIT_EXPONENT);
 #endif
     try {

diff --git a/test_problems/VCSnonideal/NaCl_equil/nacl_equil.cpp b/test_problems/VCSnonideal/NaCl_equil/nacl_equil.cpp
@@ -25,7 +25,7 @@ void printUsage()
 
 int main(int argc, char** argv)
 {
-#ifdef _MSC_VER
+#if defined(_MSC_VER) && _MSC_VER < 1900
     _set_output_format(_TWO_DIGIT_EXPONENT);
 #endif
     suppress_deprecation_warnings();

diff --git a/test_problems/VPsilane_test/silane_equil.cpp b/test_problems/VPsilane_test/silane_equil.cpp
@@ -11,7 +11,7 @@ using namespace Cantera;
 
 int main(int argc, char** argv)
 {
-#ifdef _MSC_VER
+#if defined(_MSC_VER) && _MSC_VER < 1900
     _set_output_format(_TWO_DIGIT_EXPONENT);
 #endif
     try {

diff --git a/test_problems/cathermo/HMW_test_1/HMW_test_1.cpp b/test_problems/cathermo/HMW_test_1/HMW_test_1.cpp
@@ -30,7 +30,7 @@ void pAtable(HMWSoln* HMW)
 
 int main(int argc, char** argv)
 {
-#ifdef _MSC_VER
+#if defined(_MSC_VER) && _MSC_VER < 1900
     _set_output_format(_TWO_DIGIT_EXPONENT);
 #endif
     int retn = 0;

diff --git a/test_problems/cathermo/HMW_test_3/HMW_test_3.cpp b/test_problems/cathermo/HMW_test_3/HMW_test_3.cpp
@@ -30,7 +30,7 @@ void pAtable(HMWSoln* HMW)
 
 int main(int argc, char** argv)
 {
-#ifdef _MSC_VER
+#if defined(_MSC_VER) && _MSC_VER < 1900
     _set_output_format(_TWO_DIGIT_EXPONENT);
 #endif
 

diff --git a/test_problems/cathermo/VPissp/ISSPTester.cpp b/test_problems/cathermo/VPissp/ISSPTester.cpp
@@ -24,7 +24,7 @@ using namespace Cantera;
 
 int main(int argc, char** argv)
 {
-#ifdef _MSC_VER
+#if defined(_MSC_VER) && _MSC_VER < 1900
     _set_output_format(_TWO_DIGIT_EXPONENT);
 #endif
 

diff --git a/test_problems/cathermo/ims/IMSTester.cpp b/test_problems/cathermo/ims/IMSTester.cpp
@@ -23,7 +23,7 @@ using namespace Cantera;
 
 int main(int argc, char** argv)
 {
-#ifdef _MSC_VER
+#if defined(_MSC_VER) && _MSC_VER < 1900
     _set_output_format(_TWO_DIGIT_EXPONENT);
 #endif
 

diff --git a/test_problems/cathermo/issp/ISSPTester.cpp b/test_problems/cathermo/issp/ISSPTester.cpp
@@ -24,7 +24,7 @@ using namespace Cantera;
 
 int main(int argc, char** argv)
 {
-#ifdef _MSC_VER
+#if defined(_MSC_VER) && _MSC_VER < 1900
     _set_output_format(_TWO_DIGIT_EXPONENT);
 #endif
 

diff --git a/test_problems/cathermo/testIAPWS/testIAPWSphi.cpp b/test_problems/cathermo/testIAPWS/testIAPWSphi.cpp
@@ -8,7 +8,7 @@ using namespace Cantera;
 
 int main()
 {
-#ifdef _MSC_VER
+#if defined(_MSC_VER) && _MSC_VER < 1900
     _set_output_format(_TWO_DIGIT_EXPONENT);
 #endif
     WaterPropsIAPWSphi* phi = new WaterPropsIAPWSphi();

diff --git a/test_problems/cathermo/testIAPWSPres/testPress.cpp b/test_problems/cathermo/testIAPWSPres/testPress.cpp
@@ -20,7 +20,7 @@ double numdpdt(WaterPropsIAPWS* water, double T, double pres)
 
 int main()
 {
-#ifdef _MSC_VER
+#if defined(_MSC_VER) && _MSC_VER < 1900
     _set_output_format(_TWO_DIGIT_EXPONENT);
 #endif
     double dens, u, s, h;

diff --git a/test_problems/cathermo/testIAPWSTripP/testTripleP.cpp b/test_problems/cathermo/testIAPWSTripP/testTripleP.cpp
@@ -9,7 +9,7 @@ using namespace Cantera;
 
 int main()
 {
-#ifdef _MSC_VER
+#if defined(_MSC_VER) && _MSC_VER < 1900
     _set_output_format(_TWO_DIGIT_EXPONENT);
 #endif
     double dens, u, s, h, cv, cp, pres;

diff --git a/test_problems/cathermo/testWaterPDSS/testWaterPDSS.cpp b/test_problems/cathermo/testWaterPDSS/testWaterPDSS.cpp
@@ -18,7 +18,7 @@ double tvalue(double val, double atol = 1.0E-9)
 
 int main()
 {
-#ifdef _MSC_VER
+#if defined(_MSC_VER) && _MSC_VER < 1900
     _set_output_format(_TWO_DIGIT_EXPONENT);
 #endif
     double pres;

diff --git a/test_problems/cathermo/testWaterTP/testWaterSSTP.cpp b/test_problems/cathermo/testWaterTP/testWaterSSTP.cpp
@@ -17,7 +17,7 @@ double tvalue(double val, double atol = 1.0E-9)
 
 int main()
 {
-#ifdef _MSC_VER
+#if defined(_MSC_VER) && _MSC_VER < 1900
     _set_output_format(_TWO_DIGIT_EXPONENT);
 #endif
     double pres;

diff --git a/test_problems/cxx_ex/examples.cpp b/test_problems/cxx_ex/examples.cpp
@@ -33,7 +33,7 @@ exfun fex[] = {kinetics_example1, kinetics_example3,
 // main program
 int main(int argc, char** argv)
 {
-#ifdef _MSC_VER
+#if defined(_MSC_VER) && _MSC_VER < 1900
     _set_output_format(_TWO_DIGIT_EXPONENT);
 #endif
     int example_num = 0;

diff --git a/test_problems/diamondSurf/runDiamond.cpp b/test_problems/diamondSurf/runDiamond.cpp
@@ -26,7 +26,7 @@ void printDbl(double val)
 
 int main(int argc, char** argv)
 {
-#ifdef _MSC_VER
+#if defined(_MSC_VER) && _MSC_VER < 1900
     _set_output_format(_TWO_DIGIT_EXPONENT);
 #endif
     if (argc != 2) {

diff --git a/test_problems/mixGasTransport/mixGasTransport.cpp b/test_problems/mixGasTransport/mixGasTransport.cpp
@@ -26,7 +26,7 @@ using namespace Cantera;
 
 int main(int argc, char** argv)
 {
-#ifdef _MSC_VER
+#if defined(_MSC_VER) && _MSC_VER < 1900
     _set_output_format(_TWO_DIGIT_EXPONENT);
 #endif
     string infile = "diamond.xml";

diff --git a/test_problems/multiGasTransport/multiGasTransport.cpp b/test_problems/multiGasTransport/multiGasTransport.cpp
@@ -36,7 +36,7 @@ static double cutoff(double val, double atol=1.0E-15)
 
 int main(int argc, char** argv)
 {
-#ifdef _MSC_VER
+#if defined(_MSC_VER) && _MSC_VER < 1900
     _set_output_format(_TWO_DIGIT_EXPONENT);
 #endif
     string infile = "diamond.xml";

diff --git a/test_problems/pureFluidTest/testPureWater.cpp b/test_problems/pureFluidTest/testPureWater.cpp
@@ -17,7 +17,7 @@ double tvalue(double val, double atol = 1.0E-9)
 
 int main()
 {
-#ifdef _MSC_VER
+#if defined(_MSC_VER) && _MSC_VER < 1900
     _set_output_format(_TWO_DIGIT_EXPONENT);
 #endif
     double pres;

diff --git a/test_problems/rankine_democxx/rankine.cpp b/test_problems/rankine_democxx/rankine.cpp
@@ -76,7 +76,7 @@ int openRankine(int np, void* p)
 
 int main()
 {
-#ifdef _MSC_VER
+#if defined(_MSC_VER) && _MSC_VER < 1900
     _set_output_format(_TWO_DIGIT_EXPONENT);
 #endif
     try {

diff --git a/test_problems/silane_equil/silane_equil.cpp b/test_problems/silane_equil/silane_equil.cpp
@@ -9,7 +9,7 @@ using namespace Cantera;
 
 int main(int argc, char** argv)
 {
-#ifdef _MSC_VER
+#if defined(_MSC_VER) && _MSC_VER < 1900
     _set_output_format(_TWO_DIGIT_EXPONENT);
 #endif
     try {

diff --git a/test_problems/surfSolverTest/surfaceSolver.cpp b/test_problems/surfSolverTest/surfaceSolver.cpp
@@ -150,7 +150,7 @@ void printSurf(ostream& oooo,
 
 int main(int argc, char** argv)
 {
-#ifdef _MSC_VER
+#if defined(_MSC_VER) && _MSC_VER < 1900
     _set_output_format(_TWO_DIGIT_EXPONENT);
 #endif
     string infile;