From fc168e47ab796c6950391123f7322a0c1ecce556 Mon Sep 17 00:00:00 2001 From: Harry Moffat Date: Mon, 28 Mar 2011 20:52:35 +0000 Subject: [PATCH] Fixes due to namespace isues. --- Cantera/clib/src/ctfunc.cpp | 3 ++- Cantera/clib/src/ctreactor.cpp | 2 ++ Cantera/clib/src/ctxml.cpp | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Cantera/clib/src/ctfunc.cpp b/Cantera/clib/src/ctfunc.cpp index 8e7fd442a..646c4ba9e 100755 --- a/Cantera/clib/src/ctfunc.cpp +++ b/Cantera/clib/src/ctfunc.cpp @@ -17,10 +17,11 @@ #include "Func1.h" #include "ctexceptions.h" -using namespace Cantera; #include "Cabinet.h" +using namespace Cantera; +using namespace std; typedef Func1 func_t; diff --git a/Cantera/clib/src/ctreactor.cpp b/Cantera/clib/src/ctreactor.cpp index 0e8fff638..8b12ae5c2 100755 --- a/Cantera/clib/src/ctreactor.cpp +++ b/Cantera/clib/src/ctreactor.cpp @@ -27,6 +27,8 @@ #include "Storage.h" using namespace CanteraZeroD; +using namespace Cantera; +using namespace std; typedef ReactorBase reactor_t; typedef ReactorNet reactornet_t; diff --git a/Cantera/clib/src/ctxml.cpp b/Cantera/clib/src/ctxml.cpp index 57b237293..7c1049ebf 100644 --- a/Cantera/clib/src/ctxml.cpp +++ b/Cantera/clib/src/ctxml.cpp @@ -24,6 +24,7 @@ using namespace std; using namespace Cantera; +using namespace ctml; // Assign storage for the static member of the Templated Cabinet class