From 5de392c0a6b28b70ffc49abb66fc346a1dc3152d Mon Sep 17 00:00:00 2001
From: Harry Moffat <hkmoffa@sandia.gov>
Date: Mon, 28 Mar 2011 20:18:37 +0000
Subject: [PATCH] Took out namespaces from headers.

---
 Cantera/src/transport/AqueousTransport.h   | 7 +++----
 Cantera/src/transport/LiquidTransport.h    | 2 --
 Cantera/src/transport/SimpleTransport.h    | 5 -----
 Cantera/src/transport/TransportFactory.cpp | 1 +
 Cantera/src/transport/WaterTransport.h     | 1 -
 5 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/Cantera/src/transport/AqueousTransport.h b/Cantera/src/transport/AqueousTransport.h
index efe4d0f7c..c2d9b47d5 100644
--- a/Cantera/src/transport/AqueousTransport.h
+++ b/Cantera/src/transport/AqueousTransport.h
@@ -13,7 +13,6 @@
 #ifndef CT_AQUEOUSTRAN_H
 #define CT_AQUEOUSTRAN_H
 
-using namespace std;
 
 // Cantera includes
 #include "TransportBase.h"
@@ -403,14 +402,14 @@ namespace Cantera {
      * These express the temperature dependendence of the pures
      * species viscosities.
      */
-    vector<vector_fp>            m_visccoeffs;
+    std::vector<vector_fp>            m_visccoeffs;
 
     //! Polynomial coefficients of the conductivities
     /*!
      * These express the temperature dependendence of the pures
      * species conductivities
      */
-    vector<vector_fp>            m_condcoeffs;
+    std::vector<vector_fp>            m_condcoeffs;
 
     //! Polynomial coefficients of the binary diffusion coefficients
     /*!
@@ -418,7 +417,7 @@ namespace Cantera {
      * binary diffusivities. An overall pressure dependence is then
      * added.
      */
-    vector<vector_fp>            m_diffcoeffs;
+    std::vector<vector_fp>            m_diffcoeffs;
  
 
     //! Internal value of the gradient of the mole fraction vector
diff --git a/Cantera/src/transport/LiquidTransport.h b/Cantera/src/transport/LiquidTransport.h
index 4c056475c..352687c47 100644
--- a/Cantera/src/transport/LiquidTransport.h
+++ b/Cantera/src/transport/LiquidTransport.h
@@ -19,8 +19,6 @@
 #include <numeric>
 #include <algorithm>
 
-using namespace std;
-
 // Cantera includes
 #include "TransportBase.h"
 #include "DenseMatrix.h"
diff --git a/Cantera/src/transport/SimpleTransport.h b/Cantera/src/transport/SimpleTransport.h
index d7c4c9f26..b82d6120b 100644
--- a/Cantera/src/transport/SimpleTransport.h
+++ b/Cantera/src/transport/SimpleTransport.h
@@ -21,8 +21,6 @@
 #include <numeric>
 #include <algorithm>
 
-using namespace std;
-
 // Cantera includes
 #include "TransportBase.h"
 #include "DenseMatrix.h"
@@ -31,9 +29,6 @@ using namespace std;
 
 namespace Cantera {
 
-
-
-
   class LiquidTransportParams;
 
     
diff --git a/Cantera/src/transport/TransportFactory.cpp b/Cantera/src/transport/TransportFactory.cpp
index 555e56c2d..8162bdec5 100644
--- a/Cantera/src/transport/TransportFactory.cpp
+++ b/Cantera/src/transport/TransportFactory.cpp
@@ -49,6 +49,7 @@
 #include <cstdio>
 #include <cstring>
 
+using namespace std;
 
 
 //! polynomial degree used for fitting collision integrals
diff --git a/Cantera/src/transport/WaterTransport.h b/Cantera/src/transport/WaterTransport.h
index c8ad75a67..f4e626bbe 100644
--- a/Cantera/src/transport/WaterTransport.h
+++ b/Cantera/src/transport/WaterTransport.h
@@ -19,7 +19,6 @@
 #include <numeric>
 #include <algorithm>
 
-using namespace std;
 
 // Cantera includes
 #include "TransportBase.h"