Moved some classes out of the global namespace into namespace Cantera

include/cantera/base/utilities.h

@@ -20,6 +20,8 @@
 
 #include <algorithm>
 
+namespace Cantera
+{
 //! Unary operator to multiply the argument by a constant.
 /*!
  *  The form of this operator is designed for use by std::transform.
@@ -50,9 +52,6 @@ template<class T> struct timesConstant : public std::unary_function<T, double> {
     T m_c;
 };
 
-
-namespace Cantera
-{
 //!  Templated Inner product of two vectors of length 4.
 /*!
  * If either \a x

include/cantera/thermo/WaterPropsIAPWSphi.h

@@ -15,6 +15,9 @@
 
 #include "cantera/base/config.h"
 
+namespace Cantera
+{
+
 /*!
  * the WaterPropsIAPSWSphi class support low level calls for
  * the real description of water.
@@ -221,4 +224,6 @@ private:
     //! Last delta that was used to calculate polynomials
     doublereal DELTAsave;
 };
+
+} // namespace Cantera
 #endif

src/thermo/WaterPropsIAPWSphi.cpp

@@ -13,6 +13,9 @@
 #include <cstdio>
 #include <cmath>
 
+namespace Cantera
+{
+
 using std::printf;
 using std::sqrt;
 using std::log;
@@ -1308,3 +1311,4 @@ doublereal  WaterPropsIAPWSphi::cp_R() const
     return cpR;
 }
 
+} // namespace Cantera

test_problems/cathermo/testIAPWS/testIAPWSphi.cpp

@@ -4,6 +4,7 @@
 #include <cstdio>
 
 using namespace std;
+using namespace Cantera;
 
 int main()
 {