jdonohue 00/02/07 09:58:09
Modified: c/src/XSLT XSLTEngineImpl.cpp XSLTEngineImpl.hpp
Log:
Moved static initialization to static function
Revision Changes Path
1.8 +8 -16 xml-xalan/c/src/XSLT/XSLTEngineImpl.cpp
Index: XSLTEngineImpl.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/XSLTEngineImpl.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- XSLTEngineImpl.cpp 2000/02/03 20:13:22 1.7
+++ XSLTEngineImpl.cpp 2000/02/07 17:58:08 1.8
@@ -55,7 +55,7 @@
* <http://www.apache.org/>.
*/
/**
- * $Id: XSLTEngineImpl.cpp,v 1.7 2000/02/03 20:13:22 jdonohue Exp $
+ * $Id: XSLTEngineImpl.cpp,v 1.8 2000/02/07 17:58:08 jdonohue Exp $
*
* $State: Exp $
*
@@ -222,10 +222,8 @@
XSLTEngineImpl::InitializeXSLT4JElementKeys();
-const XSLTEngineImpl::StaticInitializer
XSLTEngineImpl::s_staticInitializer;
-
//==========================================================
// SECTION: Constructors
//==========================================================
@@ -292,10 +290,15 @@
m_stackGuard(*this),
m_variableStacks(*this)
{
- // @@ what's this
- // FormatterToXML.initEncodings();
}
+void XSLTEngineImpl::Initialize()
+{
+ InstallFunctions();
+ InitializeAttributeKeysTable();
+ InitializeElementKeysTable();
+ InitializeXSLT4JElementKeys();
+}
/**
@@ -4494,16 +4497,5 @@
}
-
-XSLTEngineImpl::StaticInitializer::StaticInitializer()
-{
- XSLTEngineImpl::InstallFunctions();
-}
-
-
-
-XSLTEngineImpl::StaticInitializer::~StaticInitializer()
-{
-}
//////////////////////////////////////////////////////////////////////////////
1.6 +7 -14 xml-xalan/c/src/XSLT/XSLTEngineImpl.hpp
Index: XSLTEngineImpl.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/XSLTEngineImpl.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XSLTEngineImpl.hpp 2000/02/03 20:13:23 1.5
+++ XSLTEngineImpl.hpp 2000/02/07 17:58:09 1.6
@@ -59,7 +59,7 @@
/**
*
- * $Id: XSLTEngineImpl.hpp,v 1.5 2000/02/03 20:13:23 jdonohue Exp $
+ * $Id: XSLTEngineImpl.hpp,v 1.6 2000/02/07 17:58:09 jdonohue Exp $
*
* $State: Exp $
*
@@ -301,6 +301,12 @@
public:
/**
+ * Perform initialization of statics -- must be called before any
+ * processing occurs
+ */
+ static void Initialize();
+
+ /**
* Transform the source tree to the output in the given
* result tree target.
* @param inputSource The input source.
@@ -2799,19 +2805,6 @@
static ElementKeysMapType
InitializeXSLT4JElementKeys();
- // Class to provide static initialization for XSLTEngineImpl...
- class StaticInitializer
- {
- public:
-
- StaticInitializer();
-
- ~StaticInitializer();
- };
-
- friend class StaticInitializer;
-
- static const StaticInitializer s_staticInitializer;
}; // end XSLTEngineImpl class
