Removed 'using namespace Cantera' from all header files

This commit is contained in:
Ray Speth 2012-01-23 03:37:08 +00:00
parent c708682e56
commit 32afe97ebd
9 changed files with 10 additions and 18 deletions

View file

@ -4,8 +4,6 @@
#include <cantera/kernel/Array.h>
#include <cantera/kernel/plots.h>
using namespace Cantera;
// Save the temperature, density, pressure, and mole fractions at one
// time
template<class G, class A>

View file

@ -20,6 +20,8 @@
#include "flib_defs.h"
using namespace Cantera;
// Assert that there is storage
// for the templated classes' static member
// (needed to compile on solaris)

View file

@ -18,7 +18,4 @@
typedef integer status_t;
namespace Cantera {}
using namespace Cantera;
#endif

View file

@ -123,8 +123,8 @@ int main() {
eqs.writeCSV();
return 0;
}
catch (CanteraError) {
showErrors(cerr);
catch (Cantera::CanteraError) {
Cantera::showErrors(std::cerr);
return -1;
}
}

View file

@ -7,7 +7,6 @@
#include <cantera/Cantera.h>
#include <cantera/onedim.h>
using namespace Cantera;
/// Namespace for the boundary value problem package.
namespace BVP {
@ -63,7 +62,7 @@ namespace BVP {
* Class BoundaryValueProblem derives from Cantera's Domain1D
* class.
*/
class BoundaryValueProblem : public Domain1D {
class BoundaryValueProblem : public Cantera::Domain1D {
public:
@ -197,9 +196,9 @@ namespace BVP {
protected:
Domain1D* m_left; ///< dummy terminator
Domain1D* m_right; ///< dummy terminator
Sim1D* m_sim; ///< controller for solution
Cantera::Domain1D* m_left; ///< dummy terminator
Cantera::Domain1D* m_right; ///< dummy terminator
Cantera::Sim1D* m_sim; ///< controller for solution
/**

View file

@ -111,8 +111,8 @@ int main() {
eqs.writeCSV();
return 0;
}
catch (CanteraError) {
showErrors(cerr);
catch (Cantera::CanteraError) {
Cantera::showErrors(std::cerr);
return -1;
}
}

View file

@ -33,7 +33,6 @@ gmres( int m, int N, const Matrix &A, const doublereal *b, doublereal *x, double
#include "cblas.h"
#include "../../Cantera/src/ctlapack.h"
using namespace Cantera;
template< class Matrix >
inline int

View file

@ -33,7 +33,6 @@ gmres( int m, int N, const Matrix &A, const doublereal *b, doublereal *x, double
#include "cblas.h"
#include "../../Cantera/src/ctlapack.h"
using namespace Cantera;
template< class Matrix >
inline int

View file

@ -4,8 +4,6 @@
#include <cantera/kernel/Array.h>
#include <cantera/kernel/plots.h>
using namespace Cantera;
// Save the temperature, density, pressure, and mole fractions at one
// time
template<class G, class A>