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

Fixed linking error in python module that was caused by

Browse source 
duplicate static member storage statements on linux.
This commit is contained in:
Harry Moffat 2007-04-10 22:04:06 +00:00
parent 874e8192a4
commit b32b2c2844
4 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Cantera/clib/src/ct.cpp
View file

@ -33,10 +33,6 @@
using namespace std; using namespace std;
using namespace Cantera; using namespace Cantera;
// Assign storage for the static member of the Templated Cabinet class
//class Cabinet<XML_Node>;
template<> Cabinet<Cantera::XML_Node>* Cabinet<Cantera::XML_Node>::__storage = (Cabinet<Cantera::XML_Node>* )0;
inline XML_Node* _xml(int i) { inline XML_Node* _xml(int i) {
return Cabinet<Cantera::XML_Node>::cabinet(false)->item(i); return Cabinet<Cantera::XML_Node>::cabinet(false)->item(i);
} }

1
Cantera/clib/src/ctfunc.cpp
View file

@ -20,6 +20,7 @@ using namespace Cantera;
typedef Func1 func_t; typedef Func1 func_t;
// Assign storage to the Cabinet<Func1> static member
template<> Cabinet<func_t>* Cabinet<func_t>::__storage = 0; template<> Cabinet<func_t>* Cabinet<func_t>::__storage = 0;
inline func_t* _func(int i) { inline func_t* _func(int i) {

3
Cantera/clib/src/ctreactor.cpp
View file

@ -60,9 +60,6 @@ inline ThermoPhase* _th(int n) {
return Storage::__storage->__thtable[n]; return Storage::__storage->__thtable[n];
} }
// Assign storage for the templated Cabinet class's static member
template<> Cabinet<Func1> * Cabinet<Func1>::__storage = 0;
inline Func1* _func(int i) { inline Func1* _func(int i) {
return Cabinet<Func1>::cabinet()->item(i); return Cabinet<Func1>::cabinet()->item(i);
} }

2
Cantera/clib/src/ctxml.cpp
View file

@ -19,6 +19,8 @@
#define ERR -999 #define ERR -999
#define DERR -999.999 #define DERR -999.999
// Assign storage for the static member of the Templated Cabinet class
// class Cabinet<XML_Node>;
template<> Cabinet<XML_Node>* Cabinet<XML_Node>::__storage = 0; template<> Cabinet<XML_Node>* Cabinet<XML_Node>::__storage = 0;
inline XML_Node* _xml(int i) { inline XML_Node* _xml(int i) {