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

Solaris 10 update

Browse source 
Forgot the template specialization on the static storage declaration.
  Thus, previous commit wouldn't compile on linux. This fixes the
  problem.
This commit is contained in:
Harry Moffat 2007-03-20 22:42:17 +00:00
parent 70499779ec
commit dfc7e71f5b
4 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -26,6 +26,7 @@
#include "Cabinet.h"
#include "InterfaceKinetics.h"
#include "PureFluidPhase.h"
//#include "xml.h"
#include "clib_defs.h"
@ -33,10 +34,11 @@ using namespace std;
using namespace Cantera;
// Assign storage for the static member of the Templated Cabinet class
Cabinet<XML_Node> * Cabinet<XML_Node>::__storage = 0;
//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<XML_Node>::cabinet(false)->item(i);
return Cabinet<Cantera::XML_Node>::cabinet(false)->item(i);
}

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

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

2
Cantera/fortran/src/fct.cpp
View file

@ -28,7 +28,7 @@
#include "flib_defs.h"
// Assign storage for the templated classes' static member
Cabinet<XML_Node> * Cabinet<XML_Node>::__storage=0;
template<> Cabinet<XML_Node> * Cabinet<XML_Node>::__storage=0;
inline XML_Node* _xml(const integer* n) {
return Cabinet<XML_Node>::cabinet()->item(*n);

2
Cantera/fortran/src/fctxml.cpp
View file

@ -8,7 +8,7 @@
#include "../../clib/src/Cabinet.h"
// Assign storage for the templated classes static member
Cabinet<XML_Node> * Cabinet<XML_Node>::__storage = 0;
template<> Cabinet<XML_Node> * Cabinet<XML_Node>::__storage = 0;
inline XML_Node* _xml(const integer* i) {
return Cabinet<XML_Node>::cabinet(false)->item(*i);