Fixed linking error in python module that was caused by

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

View file

@ -33,10 +33,6 @@
using namespace std;
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) {
return Cabinet<Cantera::XML_Node>::cabinet(false)->item(i);
}

View file

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

View file

@ -60,9 +60,6 @@ inline ThermoPhase* _th(int 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) {
return Cabinet<Func1>::cabinet()->item(i);
}

View file

@ -19,6 +19,8 @@
#define ERR -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;
inline XML_Node* _xml(int i) {