From b23a49c1f2e2a87764e9479f03c36da924ebe31b Mon Sep 17 00:00:00 2001 From: Harry Moffat Date: Tue, 20 Mar 2007 21:58:27 +0000 Subject: [PATCH] Solaris 10 updates Added declarations of static member storage for templated classes. --- Cantera/clib/src/ct.cpp | 3 +++ Cantera/clib/src/ctreactor.cpp | 3 +++ Cantera/fortran/src/fct.cpp | 3 +++ Cantera/fortran/src/fctxml.cpp | 3 +++ 4 files changed, 12 insertions(+) diff --git a/Cantera/clib/src/ct.cpp b/Cantera/clib/src/ct.cpp index d9bd16b8a..2caa7be10 100755 --- a/Cantera/clib/src/ct.cpp +++ b/Cantera/clib/src/ct.cpp @@ -32,6 +32,9 @@ using namespace std; using namespace Cantera; +// Assign storage for the static member of the Templated Cabinet class +Cabinet * Cabinet::__storage = 0; + inline XML_Node* _xml(int i) { return Cabinet::cabinet(false)->item(i); } diff --git a/Cantera/clib/src/ctreactor.cpp b/Cantera/clib/src/ctreactor.cpp index 62c978f0b..560facba5 100755 --- a/Cantera/clib/src/ctreactor.cpp +++ b/Cantera/clib/src/ctreactor.cpp @@ -60,6 +60,9 @@ inline ThermoPhase* _th(int n) { return Storage::__storage->__thtable[n]; } +// Assign storage for the templated Cabinet class's static member +Cabinet * Cabinet::__storage = 0; + inline Func1* _func(int i) { return Cabinet::cabinet()->item(i); } diff --git a/Cantera/fortran/src/fct.cpp b/Cantera/fortran/src/fct.cpp index c1cbbc036..e9332fd64 100644 --- a/Cantera/fortran/src/fct.cpp +++ b/Cantera/fortran/src/fct.cpp @@ -27,6 +27,9 @@ #include "flib_defs.h" +// Assign storage for the templated classes' static member +Cabinet * Cabinet::__storage=0; + inline XML_Node* _xml(const integer* n) { return Cabinet::cabinet()->item(*n); } diff --git a/Cantera/fortran/src/fctxml.cpp b/Cantera/fortran/src/fctxml.cpp index 87a19f8bd..b56f6dbe6 100644 --- a/Cantera/fortran/src/fctxml.cpp +++ b/Cantera/fortran/src/fctxml.cpp @@ -7,6 +7,9 @@ #include "../../clib/src/Cabinet.h" +// Assign storage for the templated classes static member +Cabinet * Cabinet::__storage = 0; + inline XML_Node* _xml(const integer* i) { return Cabinet::cabinet(false)->item(*i); }