research/cantera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed namespace issues.

Browse source
This commit is contained in:
Harry Moffat 2011-03-28 21:00:26 +00:00
parent fc168e47ab
commit fc816aefb6
2 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
Cantera/cxx/demos/kinetics1/example_utils.h
View file

@ -5,11 +5,8 @@
#include <cantera/kernel/plots.h>
namespace Cantera{}
using namespace Cantera;
namespace std{}
using namespace std;
namespace CanteraZeroD{}
using namespace CanteraZeroD;
// Save the temperature, density, pressure, and mole fractions at one
// time
@ -48,18 +45,18 @@ 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;
s << " Cantera version " << "CANTERA_VERSION" << endl;
s << " Copyright California Institute of Technology, 2002." << endl;
s << " http://www.cantera.org" << endl;
s << endl;
inline void writeCanteraHeader(std::ostream& s) {
s << std::endl;
s << " Cantera version " << "CANTERA_VERSION" << std::endl;
s << " Copyright California Institute of Technology, 2002." << std::endl;
s << " http://www.cantera.org" << std::endl;
s << std::endl;
}
#endif

4
Cantera/cxx/demos/kinetics1/kinetics1.cpp
View file

@ -24,6 +24,10 @@
#include <time.h>
#include "example_utils.h"
using namespace std;
using namespace Cantera;
using namespace CanteraZeroD;
using namespace Cantera_CXX;
int kinetics1(int np, void* p) {