From 5d5138c677ec1239232f2bec52eae3bbd712face Mon Sep 17 00:00:00 2001
From: Harry Moffat <hkmoffa@sandia.gov>
Date: Mon, 28 Mar 2011 21:05:22 +0000
Subject: [PATCH] Fixed namespace issues.

---
 examples/cxx/equil_example1.cpp     |  2 ++
 examples/cxx/example_utils.h        | 20 +++++++++-----------
 examples/cxx/kinetics_example2.cpp  |  2 ++
 examples/cxx/kinetics_example3.cpp  |  2 ++
 examples/cxx/rxnpath_example1.cpp   |  3 ++-
 examples/cxx/transport_example1.cpp |  2 ++
 examples/cxx/transport_example2.cpp |  2 ++
 7 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/examples/cxx/equil_example1.cpp b/examples/cxx/equil_example1.cpp
index d188be7f0..a3a414161 100755
--- a/examples/cxx/equil_example1.cpp
+++ b/examples/cxx/equil_example1.cpp
@@ -25,6 +25,8 @@
 
 using namespace Cantera;
 using namespace Cantera_CXX;
+using namespace CanteraZeroD;
+using namespace std;
 //-------------------------------------------------------------------
 
 // utility functions for plotting
diff --git a/examples/cxx/example_utils.h b/examples/cxx/example_utils.h
index 2439816e1..9211aa94d 100755
--- a/examples/cxx/example_utils.h
+++ b/examples/cxx/example_utils.h
@@ -5,9 +5,7 @@
 #include <cantera/kernel/plots.h>
 
 using namespace Cantera;
-using namespace std;
 namespace CanteraZeroD{}
-using namespace CanteraZeroD;
 
 // Save the temperature, density, pressure, and mole fractions at one
 // time
@@ -47,22 +45,22 @@ void makeDataLabels(const G& gas, V& names) {
 }
 
 template<class G, class A>
-void plotSoln(string fname, string fmt, string title, const G& gas, const A& soln) {
-    vector<string> names;
+void plotSoln(std::string fname, std::string fmt, std::string title, const G& gas, const A& soln) {
+    std::vector<std::string> names;
     makeDataLabels(gas, names);
     writePlotFile(fname, fmt, title, names, soln);
 }
 
-inline void writeCanteraHeader(ostream& s) {
-    s << endl;
+inline void writeCanteraHeader(std::ostream& s) {
+    s << std::endl;
 #ifdef CANTERA_VERSION
-    s << "     Cantera version " << CANTERA_VERSION << endl;        
+    s << "     Cantera version " << CANTERA_VERSION << std::endl;        
 #else
-    s << "     ???" << endl;
+    s << "     ???" << std::endl;
 #endif
-    s << "     Copyright California Institute of Technology, 2002." << endl;
-    s << "     http://www.cantera.org" << endl;
-    s << endl;
+    s << "     Copyright California Institute of Technology, 2002." << std::endl;
+    s << "     http://www.cantera.org" << std::endl;
+    s << std::endl;
 }
 
 #endif
diff --git a/examples/cxx/kinetics_example2.cpp b/examples/cxx/kinetics_example2.cpp
index 2aa5ee684..5e1c74770 100755
--- a/examples/cxx/kinetics_example2.cpp
+++ b/examples/cxx/kinetics_example2.cpp
@@ -24,6 +24,8 @@
 
 using namespace Cantera;
 using namespace Cantera_CXX;
+using namespace CanteraZeroD;
+using namespace std;
 /**
  * Same as kinetics_example1, except that it uses class GRI30 instead
  * of class IdealGasMix.
diff --git a/examples/cxx/kinetics_example3.cpp b/examples/cxx/kinetics_example3.cpp
index ab2932cfb..f21973376 100644
--- a/examples/cxx/kinetics_example3.cpp
+++ b/examples/cxx/kinetics_example3.cpp
@@ -24,6 +24,8 @@
 
 using namespace Cantera;
 using namespace Cantera_CXX;
+using namespace std;
+using namespace CanteraZeroD;
 
 // Kinetics example. This is written as a function so that one 
 // driver program can run multiple examples.
diff --git a/examples/cxx/rxnpath_example1.cpp b/examples/cxx/rxnpath_example1.cpp
index 5ad7690ae..19cdc5777 100755
--- a/examples/cxx/rxnpath_example1.cpp
+++ b/examples/cxx/rxnpath_example1.cpp
@@ -24,9 +24,10 @@
 #include <cantera/IdealGasMix.h>
 
 // #include <iostream>
-// using namespace std;
+using namespace std;
 using namespace Cantera;
 using namespace Cantera_CXX;
+using namespace CanteraZeroD;
 
 void writeRxnPathDiagram(double time, ReactionPathBuilder& b, 
     IdealGasMix& gas, ostream& logfile, ostream& outfile) { 
diff --git a/examples/cxx/transport_example1.cpp b/examples/cxx/transport_example1.cpp
index d483c70b0..a349396e6 100755
--- a/examples/cxx/transport_example1.cpp
+++ b/examples/cxx/transport_example1.cpp
@@ -24,6 +24,8 @@
 
 using namespace Cantera;
 using namespace Cantera_CXX;
+using namespace CanteraZeroD;
+using namespace std;
 
 template<class G, class V>
 void makeTransportDataLabels(const G& gas, V& names) {
diff --git a/examples/cxx/transport_example2.cpp b/examples/cxx/transport_example2.cpp
index e5ac40030..da18303cb 100755
--- a/examples/cxx/transport_example2.cpp
+++ b/examples/cxx/transport_example2.cpp
@@ -25,6 +25,8 @@
 
 using namespace Cantera;
 using namespace Cantera_CXX;
+using namespace CanteraZeroD;
+using namespace std;
 
 template<class G, class V>
 void makeTransportDataLabels(const G& gas, V& names) {