Fix for solaris. Previous attempted bug fix actually didn't compile on
solaris. The solution to get it to work on both linux and solaris was to add a declaration (not a definition) to the alternate file.
This commit is contained in:
parent
b32b2c2844
commit
4ae46da12f
2 changed files with 9 additions and 0 deletions
|
|
@ -33,6 +33,10 @@
|
|||
using namespace std;
|
||||
using namespace Cantera;
|
||||
|
||||
// declaration for the static storage
|
||||
// -> The definition is located in ctxml.cpp
|
||||
template<> Cabinet<XML_Node>* Cabinet<XML_Node>::__storage;
|
||||
|
||||
inline XML_Node* _xml(int i) {
|
||||
return Cabinet<Cantera::XML_Node>::cabinet(false)->item(i);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -60,6 +60,11 @@ inline ThermoPhase* _th(int n) {
|
|||
return Storage::__storage->__thtable[n];
|
||||
}
|
||||
|
||||
|
||||
// declaration for the static storage
|
||||
// -> The definition is located in ctfunc.cpp
|
||||
template<> Cabinet<Func1>* Cabinet<Func1>::__storage;
|
||||
|
||||
inline Func1* _func(int i) {
|
||||
return Cabinet<Func1>::cabinet()->item(i);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue