dbertoni 02/04/03 22:20:43
Modified: c/src/XSLT Constants.cpp Stylesheet.cpp Stylesheet.hpp
StylesheetExecutionContextDefault.cpp
XalanTemplate.cpp
Log:
OS/390 memory clean-up.
Revision Changes Path
1.18 +3 -0 xml-xalan/c/src/XSLT/Constants.cpp
Index: Constants.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/Constants.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- Constants.cpp 26 Nov 2001 23:17:23 -0000 1.17
+++ Constants.cpp 4 Apr 2002 06:20:43 -0000 1.18
@@ -794,6 +794,8 @@
releaseMemory(::ATTRNAME_XMLSPACE);
releaseMemory(::ATTRNAME_ZERODIGIT);
+ releaseMemory(::ATTRTYPE_CDATA);
+
releaseMemory(::ATTRVAL_ALPHABETIC);
releaseMemory(::ATTRVAL_ANCESTOR);
releaseMemory(::ATTRVAL_ANY);
@@ -821,6 +823,7 @@
releaseMemory(::ATTRVAL_SINGLE);
releaseMemory(::ATTRVAL_STRIP);
releaseMemory(::ATTRVAL_THIS);
+ releaseMemory(::ATTRVAL_TRADITIONAL);
releaseMemory(::ATTRVAL_YES);
releaseMemory(::DEFAULT_WHITESPACE_SEPARATOR_STRING);
1.73 +0 -4 xml-xalan/c/src/XSLT/Stylesheet.cpp
Index: Stylesheet.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/Stylesheet.cpp,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- Stylesheet.cpp 23 Feb 2002 04:23:16 -0000 1.72
+++ Stylesheet.cpp 4 Apr 2002 06:20:43 -0000 1.73
@@ -107,10 +107,6 @@
-const Stylesheet::NamespaceVectorType Stylesheet::s_emptyNamespace;
-
-
-
const XalanDOMString Stylesheet::s_emptyString;
const XalanQNameByReference Stylesheet::s_emptyQName;
1.43 +0 -16 xml-xalan/c/src/XSLT/Stylesheet.hpp
Index: Stylesheet.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/Stylesheet.hpp,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- Stylesheet.hpp 23 Feb 2002 03:36:16 -0000 1.42
+++ Stylesheet.hpp 4 Apr 2002 06:20:43 -0000 1.43
@@ -287,16 +287,6 @@
m_namespaceDecls = ns;
}
- /*
- * Get the top entry on the namespace stack, or 0, if
- * there is nothing on the stack.
- */
- const NamespaceVectorType&
- getCurrentNamespace() const
- {
- return m_namespaces.size() > 0 ? m_namespaces.back() :
s_emptyNamespace;
- }
-
/**
* Push the namespace declarations from the current attribute
* list onto the namespace stack.
@@ -1185,12 +1175,6 @@
* for mapping from prefix to namespace URI.
*/
NamespaceVectorType
m_namespaceDecls;
-
- /**
- * This is pushed on the m_resultNameSpaces stack 'till a xmlns
attribute is
- * found.
- */
- static const NamespaceVectorType s_emptyNamespace;
/**
* Tells if the stylesheet is without an xsl:stylesheet and xsl:template
1.84 +0 -3
xml-xalan/c/src/XSLT/StylesheetExecutionContextDefault.cpp
Index: StylesheetExecutionContextDefault.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XSLT/StylesheetExecutionContextDefault.cpp,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- StylesheetExecutionContextDefault.cpp 3 Apr 2002 05:13:38 -0000
1.83
+++ StylesheetExecutionContextDefault.cpp 4 Apr 2002 06:20:43 -0000
1.84
@@ -2375,6 +2375,3 @@
assert(m_matchPatternCache.size() == 0);
}
-
-
-
1.35 +37 -40 xml-xalan/c/src/XSLT/XalanTemplate.cpp
Index: XalanTemplate.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/XalanTemplate.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- XalanTemplate.cpp 2 Apr 2002 05:37:35 -0000 1.34
+++ XalanTemplate.cpp 4 Apr 2002 06:20:43 -0000 1.35
@@ -89,10 +89,6 @@
#include <deque>
#include <stl/_deque.c>
-#include <string>
-#include <stl/_string.c>
-#include <stl/_string_fwd.c>
-
#include <XalanDOM/XalanNode.hpp>
@@ -187,39 +183,6 @@
-static string theString;
-static vector<XalanDOMString> theDOMStringVector;
-static vector<char> theCharVector;
-static vector<wchar_t> theWCharVector;
-static vector<unsigned char> theUnsignedCharVector;
-static AttributeListImpl::AttributeVectorType theAttributeVectorEntryVector;
-static AttributesImpl::AttributesVectorType theAttributesVectorEntryVector;
-static allocator<DOMString> theAllocator;
-static vector<pair<const XalanNode*,NSInfo> > theXalanNodeVector;
-static FormatterToHTML::ElemDesc theElemDesc;
-static FormatterToHTML::ElementFlagsMapType theElementFlagsMapType;
-static XPathExpression::TokenQueueType theTokenQueueType;
-static set<const XalanNode*,less<const XalanNode*> > theXalanNodeSet;
-static XPathExecutionContext::XObjectArgVectorType theVector;
-static XPathProcessorImpl::NodeTypesMapType theNodeTypesMapType;
-static Stylesheet::PatternTableListType thePatternTableList;
-static Stylesheet::PatternTableVectorType thePatternTableVector;
-static map<int,int,less<int> > theIntMap;
-static ElemNumber::DecimalToRomanVectorType theDecimalToRomanVector;
-static vector<NamespacesHandler::NamespacesMapType::iterator>
theNamespacesMapTypeIteratorVector;
-static VariablesStack::ParamsVectorType theParamsVector;
-static ElemNumber::NumberingResourceBundleMapType
theNumberingResourceBundleMapType;
-static XalanTranscodingServices::MaximumCharacterValueMapType
theMaximumCharacterValueMapType;
-static set<XalanNode*, less<XalanNode*> > theInstanceSetType;
-static XalanTransformer::CompiledStylesheetPtrVectorType
theCompiledStylesheetVector;
-static XalanTransformer::ParsedSourcePtrVectorType
theParsedSourceVector;
-static XalanTransformer::ParamPairVectorType
theParamsPairVector;
-static XalanTransformer::TraceListenerVectorType
theTraceListenerVector;
-static XalanDOMStringHashTable::BucketCountsType
theBucketCountsVector;
-static vector<pair<const char*, const char*> >
theStringPairVector;
-
-
-
static void
foo(XPathExecutionContext& theExecutionContext)
{
@@ -227,6 +190,37 @@
using std::for_each;
using std::replace;
#endif
+ {
+ vector<XalanDOMString> theDOMStringVector;
+ vector<char> theCharVector;
+ vector<wchar_t> theWCharVector;
+ vector<unsigned char> theUnsignedCharVector;
+ AttributeListImpl::AttributeVectorType
theAttributeVectorEntryVector;
+ AttributesImpl::AttributesVectorType
theAttributesVectorEntryVector;
+ allocator<DOMString> theAllocator;
+ vector<pair<const XalanNode*,NSInfo> > theXalanNodeVector;
+ FormatterToHTML::ElemDesc theElemDesc;
+ FormatterToHTML::ElementFlagsMapType theElementFlagsMapType;
+ XPathExpression::TokenQueueType theTokenQueueType;
+ set<const XalanNode*,less<const XalanNode*> > theXalanNodeSet;
+ XPathExecutionContext::XObjectArgVectorType theVector;
+ XPathProcessorImpl::NodeTypesMapType theNodeTypesMapType;
+ Stylesheet::PatternTableListType thePatternTableList;
+ Stylesheet::PatternTableVectorType thePatternTableVector;
+ map<int,int,less<int> > theIntMap;
+ ElemNumber::DecimalToRomanVectorType theDecimalToRomanVector;
+ vector<NamespacesHandler::NamespacesMapType::iterator>
theNamespacesMapTypeIteratorVector;
+ VariablesStack::ParamsVectorType theParamsVector;
+ ElemNumber::NumberingResourceBundleMapType
theNumberingResourceBundleMapType;
+ XalanTranscodingServices::MaximumCharacterValueMapType
theMaximumCharacterValueMapType;
+ set<XalanNode*, less<XalanNode*> > theInstanceSetType;
+ XalanTransformer::CompiledStylesheetPtrVectorType
theCompiledStylesheetVector;
+ XalanTransformer::ParsedSourcePtrVectorType
theParsedSourceVector;
+ XalanTransformer::ParamPairVectorType
theParamsPairVector;
+ XalanTransformer::TraceListenerVectorType
theTraceListenerVector;
+ XalanDOMStringHashTable::BucketCountsType
theBucketCountsVector;
+ vector<pair<const char*, const char*> >
theStringPairVector;
+ }
{
XObjectFactoryDefault::XObjectCollectionType theVector;
@@ -858,7 +852,6 @@
theCollection.end(),
theXObject);
}
-
#endif
}
@@ -868,8 +861,12 @@
#include <stl/_alloc.c>
-__node_alloc<0,0> alloc1;
-__node_alloc<1,0> alloc2;
+void
+foo2()
+{
+ __node_alloc<0,0> alloc1;
+ __node_alloc<1,0> alloc2;
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
