You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by db...@apache.org on 2008/09/26 23:34:53 UTC

svn commit: r699510 [3/5] - in /xalan/c/trunk: Tests/Dom2Dom/ Tests/Errortests/ Tests/PerfT/ Tests/Performance/ Tests/Threads/ samples/ExternalFunction/ src/xalanc/DOMSupport/ src/xalanc/Harness/ src/xalanc/ICUBridge/ src/xalanc/Include/ src/xalanc/Pla...

Modified: xalan/c/trunk/src/xalanc/XPath/XPath.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/XPath.cpp?rev=699510&r1=699509&r2=699510&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/XPath.cpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/XPath.cpp Fri Sep 26 14:34:43 2008
@@ -63,7 +63,7 @@
 
 
 
-XPath::XPath(MemoryManagerType& theManager, const LocatorType*      theLocator) :
+XPath::XPath(MemoryManager& theManager, const LocatorType*      theLocator) :
     m_expression(theManager),
     m_locator(theLocator),
     m_inStylesheet(false)
@@ -71,7 +71,7 @@
 }
 
 XPath*
-XPath::create(MemoryManagerType& theManager, const LocatorType* theLocator)
+XPath::create(MemoryManager& theManager, const LocatorType* theLocator)
 {
     typedef XPath Type;
 
@@ -5503,7 +5503,7 @@
 
 
 void
-XPath::initialize(MemoryManagerType& theManager)
+XPath::initialize(MemoryManager& theManager)
 {
     s_functions.setMemoryManager(theManager);
 

Modified: xalan/c/trunk/src/xalanc/XPath/XPathAllocator.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/XPathAllocator.cpp?rev=699510&r1=699509&r2=699510&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/XPathAllocator.cpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/XPathAllocator.cpp Fri Sep 26 14:34:43 2008
@@ -25,7 +25,7 @@
 
 
 
-XPathAllocator::XPathAllocator(MemoryManagerType&      theManager, size_type	theBlockCount) :
+XPathAllocator::XPathAllocator(MemoryManager&      theManager, size_type	theBlockCount) :
 	m_allocator(theManager, theBlockCount)
 {
 }

Modified: xalan/c/trunk/src/xalanc/XPath/XPathAllocator.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/XPathAllocator.hpp?rev=699510&r1=699509&r2=699510&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/XPathAllocator.hpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/XPathAllocator.hpp Fri Sep 26 14:34:43 2008
@@ -60,7 +60,7 @@
 	 *
 	 * @param theBlockSize The block size.
 	 */
-	XPathAllocator(MemoryManagerType&      theManager, size_type	theBlockCount);
+	XPathAllocator(MemoryManager&      theManager, size_type	theBlockCount);
 
 	~XPathAllocator();
 

Modified: xalan/c/trunk/src/xalanc/XPath/XPathConstructionContext.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/XPathConstructionContext.cpp?rev=699510&r1=699509&r2=699510&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/XPathConstructionContext.cpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/XPathConstructionContext.cpp Fri Sep 26 14:34:43 2008
@@ -24,7 +24,7 @@
 
 
 
-XPathConstructionContext::XPathConstructionContext(MemoryManagerType&  theManager):
+XPathConstructionContext::XPathConstructionContext(MemoryManager&  theManager):
     m_memoryManager(theManager)
 {
 }

Modified: xalan/c/trunk/src/xalanc/XPath/XPathEnvSupportDefault.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/XPathEnvSupportDefault.cpp?rev=699510&r1=699509&r2=699510&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/XPathEnvSupportDefault.cpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/XPathEnvSupportDefault.cpp Fri Sep 26 14:34:43 2008
@@ -234,7 +234,7 @@
 
 XalanDocument*
 XPathEnvSupportDefault::parseXML(
-            MemoryManagerType&      /* theManager */,
+            MemoryManager&      /* theManager */,
 			const XalanDOMString&	/* urlString */,
 			const XalanDOMString&	/* base */,
             ErrorHandler*           /* theErrorHandler */)

Modified: xalan/c/trunk/src/xalanc/XPath/XPathEnvSupportDefault.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/XPathEnvSupportDefault.hpp?rev=699510&r1=699509&r2=699510&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/XPathEnvSupportDefault.hpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/XPathEnvSupportDefault.hpp Fri Sep 26 14:34:43 2008
@@ -153,7 +153,7 @@
 
 	virtual XalanDocument*
 	parseXML(
-            MemoryManagerType&      theManager,
+            MemoryManager&      theManager,
 			const XalanDOMString&	urlString,
 			const XalanDOMString&	base,
             ErrorHandler*           theErrorHandler = 0);

Modified: xalan/c/trunk/src/xalanc/XPath/XPathEvaluator.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/XPathEvaluator.cpp?rev=699510&r1=699509&r2=699510&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/XPathEvaluator.cpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/XPathEvaluator.cpp Fri Sep 26 14:34:43 2008
@@ -67,7 +67,7 @@
 
 
 
-XPathEvaluator::XPathEvaluator(MemoryManagerType& theManager) :
+XPathEvaluator::XPathEvaluator(MemoryManager& theManager) :
     m_xobjectFactory(theManager, XObjectFactoryDefault::create(theManager)),
 	m_xpathFactory(theManager, XPathFactoryDefault::createXPathFactoryDefault(theManager)),
 	m_constructionContext(theManager, XPathConstructionContextDefault::create(theManager)),

Modified: xalan/c/trunk/src/xalanc/XPath/XPathEvaluator.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/XPathEvaluator.hpp?rev=699510&r1=699509&r2=699510&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/XPathEvaluator.hpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/XPathEvaluator.hpp Fri Sep 26 14:34:43 2008
@@ -75,7 +75,7 @@
 	// it once, unless you have called terminate previously, and
 	// you want to re-initialize the library.
 	static void
-	initialize(MemoryManagerType& theManager XALAN_DEFAULT_MEMMGR);
+	initialize(MemoryManager& theManager XALAN_DEFAULT_MEMMGR);
 
 	// Static terminator to be called after all instances
 	// are destroyed.  The call is _not_ thread-safe.  Once

Modified: xalan/c/trunk/src/xalanc/XPath/XPathExecutionContext.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/XPathExecutionContext.hpp?rev=699510&r1=699509&r2=699510&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/XPathExecutionContext.hpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/XPathExecutionContext.hpp Fri Sep 26 14:34:43 2008
@@ -307,7 +307,7 @@
      */
     virtual XalanDocument*
     parseXML(
-            MemoryManagerType&      theManager,
+            MemoryManager&      theManager,
             const XalanDOMString&   urlString,
             const XalanDOMString&   base,
             ErrorHandler*           theErrorHandler = 0) const = 0;
@@ -507,7 +507,7 @@
      * @return pointer to node list created
      */
     virtual MutableNodeRefList*
-    createMutableNodeRefList(MemoryManagerType& theManager) const = 0;
+    createMutableNodeRefList(MemoryManager& theManager) const = 0;
 
     /**
      * Given a valid element key, return the corresponding node list.

Modified: xalan/c/trunk/src/xalanc/XPath/XPathExecutionContextDefault.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/XPathExecutionContextDefault.cpp?rev=699510&r1=699509&r2=699510&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/XPathExecutionContextDefault.cpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/XPathExecutionContextDefault.cpp Fri Sep 26 14:34:43 2008
@@ -83,7 +83,7 @@
 
 
 XPathExecutionContextDefault::XPathExecutionContextDefault(
-            MemoryManagerType&      theManager,
+            MemoryManager&      theManager,
             XalanNode*              theCurrentNode,
             const NodeRefListBase*  theContextNodeList,
             const PrefixResolver*   thePrefixResolver) :
@@ -384,7 +384,7 @@
 
 XalanDocument*
 XPathExecutionContextDefault::parseXML(
-            MemoryManagerType&      theManager,
+            MemoryManager&      theManager,
             const XalanDOMString&   urlString,
             const XalanDOMString&   base,
             ErrorHandler*           theErrorHandler) const
@@ -417,7 +417,7 @@
 
 
 MutableNodeRefList*
-XPathExecutionContextDefault::createMutableNodeRefList(MemoryManagerType& theManager) const
+XPathExecutionContextDefault::createMutableNodeRefList(MemoryManager& theManager) const
 {
     return MutableNodeRefList::create(theManager);
 }

Modified: xalan/c/trunk/src/xalanc/XPath/XPathExecutionContextDefault.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/XPathExecutionContextDefault.hpp?rev=699510&r1=699509&r2=699510&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/XPathExecutionContextDefault.hpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/XPathExecutionContextDefault.hpp Fri Sep 26 14:34:43 2008
@@ -97,14 +97,14 @@
 	 */
 	explicit
 	XPathExecutionContextDefault(
-            MemoryManagerType&      theManager,
+            MemoryManager&      theManager,
 			XalanNode*				theCurrentNode = 0,
 			const NodeRefListBase*	theContextNodeList = 0,
 			const PrefixResolver*	thePrefixResolver = 0);
 
     static XPathExecutionContextDefault*
     create(
-            MemoryManagerType&      theManager,
+            MemoryManager&      theManager,
 			XalanNode*				theCurrentNode = 0,
 			const NodeRefListBase*	theContextNodeList = 0,
 			const PrefixResolver*	thePrefixResolver = 0);
@@ -236,7 +236,7 @@
 
 	virtual XalanDocument*
 	parseXML(
-            MemoryManagerType&      theManager,
+            MemoryManager&      theManager,
 			const XalanDOMString&	urlString,
 			const XalanDOMString&	base,
             ErrorHandler*           theErrorHandler = 0) const;
@@ -248,7 +248,7 @@
 	returnMutableNodeRefList(MutableNodeRefList*	theList);
 
 	virtual MutableNodeRefList*
-	createMutableNodeRefList(MemoryManagerType& theManager) const;
+	createMutableNodeRefList(MemoryManager& theManager) const;
 
 	virtual XalanDOMString&
 	getCachedString();

Modified: xalan/c/trunk/src/xalanc/XPath/XPathExpression.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/XPathExpression.cpp?rev=699510&r1=699509&r2=699510&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/XPathExpression.cpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/XPathExpression.cpp Fri Sep 26 14:34:43 2008
@@ -190,7 +190,7 @@
 
 
 XPathExpression::XPathExpressionException::XPathExpressionException(const XalanDOMString&   theMessage,
-                                                                    MemoryManagerType&      theManager) :
+                                                                    MemoryManager&      theManager) :
     XalanXPathException(theMessage, theManager)
 {
 }
@@ -330,7 +330,7 @@
 
 
 
-XPathExpression::XPathExpression(MemoryManagerType& theManager) :
+XPathExpression::XPathExpression(MemoryManager& theManager) :
     m_opMap(theManager),
     m_lastOpCodeIndex(0),
     m_tokenQueue(theManager),
@@ -381,7 +381,7 @@
 XPathExpression::OpCodeMapValueType
 XPathExpression::getOpCodeLengthFromOpMap(
             OpCodeMapPositionType     opPos,
-            MemoryManagerType&        theManager) const
+            MemoryManager&        theManager) const
 {
     assert(opPos - getInitialOpCodePosition() >= 0 &&
            opPos - getInitialOpCodePosition() < opCodeMapSize());
@@ -419,7 +419,7 @@
 #else
             OpCodeMapPositionType theIndex,
 #endif
-            MemoryManagerType&    theManager) const
+            MemoryManager&    theManager) const
 {
     OpCodeMapValueType  theResult = 0;
 

Modified: xalan/c/trunk/src/xalanc/XPath/XPathExpression.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/XPathExpression.hpp?rev=699510&r1=699509&r2=699510&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/XPathExpression.hpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/XPathExpression.hpp Fri Sep 26 14:34:43 2008
@@ -609,7 +609,7 @@
          * @param theMessage string error message
          */
         XPathExpressionException(const XalanDOMString&  theMessage,
-                                    MemoryManagerType& theManager);
+                                    MemoryManager& theManager);
 
         virtual~
         XPathExpressionException();
@@ -721,11 +721,11 @@
 #endif
 
     explicit
-    XPathExpression(MemoryManagerType& theManager);
+    XPathExpression(MemoryManager& theManager);
 
     ~XPathExpression();
 
-    MemoryManagerType&
+    MemoryManager&
     getMemoryManager()
     {
         return m_opMap.getMemoryManager();
@@ -878,7 +878,7 @@
      */
     OpCodeMapValueType
     getOpCodeLengthFromOpMap(OpCodeMapPositionType  opPos,
-                             MemoryManagerType&     theManager) const;
+                             MemoryManager&     theManager) const;
 
 #if defined(XALAN_XPATH_EXPRESSION_USE_ITERATORS)
     /**
@@ -890,7 +890,7 @@
      */
     OpCodeMapValueType
     getOpCodeLengthFromOpMap(OpCodeMapSizeType      theIndex,
-                                MemoryManagerType& theManager) const;
+                                MemoryManager& theManager) const;
 #endif
 
 #if defined(XALAN_XPATH_EXPRESSION_USE_ITERATORS)

Modified: xalan/c/trunk/src/xalanc/XPath/XPathFactoryBlock.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/XPathFactoryBlock.cpp?rev=699510&r1=699509&r2=699510&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/XPathFactoryBlock.cpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/XPathFactoryBlock.cpp Fri Sep 26 14:34:43 2008
@@ -29,7 +29,7 @@
 
 
 XPathFactoryBlock::XPathFactoryBlock(
-            MemoryManagerType&  theManager,
+            MemoryManager&  theManager,
             XalanSize_t	        theBlockSize) :
 	XPathFactory(),
 	m_allocator(theManager, theBlockSize)

Modified: xalan/c/trunk/src/xalanc/XPath/XPathFactoryBlock.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/XPathFactoryBlock.hpp?rev=699510&r1=699509&r2=699510&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/XPathFactoryBlock.hpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/XPathFactoryBlock.hpp Fri Sep 26 14:34:43 2008
@@ -47,7 +47,7 @@
 
 	explicit
 	XPathFactoryBlock(
-            MemoryManagerType&      theManager,
+            MemoryManager&      theManager,
             XalanSize_t             theBlockSize = eDefaultBlockSize);
 
 	virtual

Modified: xalan/c/trunk/src/xalanc/XPath/XPathFactoryDefault.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/XPathFactoryDefault.cpp?rev=699510&r1=699509&r2=699510&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/XPathFactoryDefault.cpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/XPathFactoryDefault.cpp Fri Sep 26 14:34:43 2008
@@ -33,14 +33,14 @@
 
 
 
-XPathFactoryDefault::XPathFactoryDefault(MemoryManagerType& theManager) :
+XPathFactoryDefault::XPathFactoryDefault(MemoryManager& theManager) :
 	XPathFactory(),
 	m_xpaths(theManager)
 {
 }
 
 XPathFactoryDefault*
-XPathFactoryDefault::createXPathFactoryDefault(MemoryManagerType& theManager)
+XPathFactoryDefault::createXPathFactoryDefault(MemoryManager& theManager)
 {
     typedef XPathFactoryDefault ThisType;
 

Modified: xalan/c/trunk/src/xalanc/XPath/XPathFactoryDefault.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/XPathFactoryDefault.hpp?rev=699510&r1=699509&r2=699510&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/XPathFactoryDefault.hpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/XPathFactoryDefault.hpp Fri Sep 26 14:34:43 2008
@@ -44,13 +44,13 @@
 public:
 
 	explicit
-	XPathFactoryDefault(MemoryManagerType& theManager XALAN_DEFAULT_MEMMGR);
+	XPathFactoryDefault(MemoryManager& theManager XALAN_DEFAULT_MEMMGR);
 
 	virtual
 	~XPathFactoryDefault();
 
 	static XPathFactoryDefault*
-	createXPathFactoryDefault(MemoryManagerType& theManager);
+	createXPathFactoryDefault(MemoryManager& theManager);
 
 	// Inherited from XPathFactory...
 	virtual void

Modified: xalan/c/trunk/src/xalanc/XPath/XPathFunctionTable.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/XPathFunctionTable.cpp?rev=699510&r1=699509&r2=699510&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/XPathFunctionTable.cpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/XPathFunctionTable.cpp Fri Sep 26 14:34:43 2008
@@ -63,7 +63,7 @@
 	 * @return pointer to the new object
 	 */
 	virtual Function*
-	clone(MemoryManagerType& theManager) const
+	clone(MemoryManager& theManager) const
 	{
         typedef FunctionNotImplemented Type;
 

Modified: xalan/c/trunk/src/xalanc/XPath/XPathFunctionTable.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/XPathFunctionTable.hpp?rev=699510&r1=699509&r2=699510&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/XPathFunctionTable.hpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/XPathFunctionTable.hpp Fri Sep 26 14:34:43 2008
@@ -110,7 +110,7 @@
     ~XPathFunctionTable();
 
     void
-    setMemoryManager(MemoryManagerType& theManager)
+    setMemoryManager(MemoryManager& theManager)
     {
         m_memoryManager = &theManager;
     }

Modified: xalan/c/trunk/src/xalanc/XPath/XPathInit.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/XPathInit.cpp?rev=699510&r1=699509&r2=699510&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/XPathInit.cpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/XPathInit.cpp Fri Sep 26 14:34:43 2008
@@ -37,7 +37,7 @@
 
 
 
-XPathInit::XPathInit(MemoryManagerType& theManager) :
+XPathInit::XPathInit(MemoryManager& theManager) :
 	m_platformSupportInit(theManager),
 	m_domSupportInit(theManager)
 {
@@ -52,7 +52,7 @@
 
 
 XPathInit*
-XPathInit::create(MemoryManagerType&    theManager)
+XPathInit::create(MemoryManager&    theManager)
 {
     XPathInit*  theResult;
 
@@ -74,7 +74,7 @@
 
 
 void
-XPathInit::initialize(MemoryManagerType& theManager)
+XPathInit::initialize(MemoryManager& theManager)
 {
     FunctionLang::initialize(theManager);
 

Modified: xalan/c/trunk/src/xalanc/XPath/XPathInit.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/XPathInit.hpp?rev=699510&r1=699509&r2=699510&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/XPathInit.hpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/XPathInit.hpp Fri Sep 26 14:34:43 2008
@@ -43,10 +43,10 @@
 public:
 
 	explicit
-	XPathInit(MemoryManagerType& theManager XALAN_DEFAULT_MEMMGR);
+	XPathInit(MemoryManager& theManager XALAN_DEFAULT_MEMMGR);
 
     static XPathInit*
-    create(MemoryManagerType& theManager);
+    create(MemoryManager& theManager);
 
 	~XPathInit();
 
@@ -60,7 +60,7 @@
 
 	
 	static void
-	initialize(MemoryManagerType& theManager);
+	initialize(MemoryManager& theManager);
 
 	static void
 	terminate();

Modified: xalan/c/trunk/src/xalanc/XPath/XPathProcessorImpl.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/XPathProcessorImpl.hpp?rev=699510&r1=699509&r2=699510&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/XPathProcessorImpl.hpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/XPathProcessorImpl.hpp Fri Sep 26 14:34:43 2008
@@ -74,14 +74,14 @@
 
     typedef XalanDOMString::size_type   t_size_type;
 
-    XPathProcessorImpl(MemoryManagerType& theManager XALAN_DEFAULT_MEMMGR);
+    XPathProcessorImpl(MemoryManager& theManager XALAN_DEFAULT_MEMMGR);
 
     virtual
     ~XPathProcessorImpl();
 
 
     static XPathProcessorImpl*
-    create(MemoryManagerType& theManager);
+    create(MemoryManager& theManager);
     // These are inherited from XPathProcessor...
 
     virtual void

Modified: xalan/c/trunk/src/xalanc/XPath/XStringAllocator.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/XStringAllocator.cpp?rev=699510&r1=699509&r2=699510&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/XStringAllocator.cpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/XStringAllocator.cpp Fri Sep 26 14:34:43 2008
@@ -25,7 +25,7 @@
 
 
 
-XStringAllocator::XStringAllocator(MemoryManagerType&  theManager, size_type	theBlockCount) :
+XStringAllocator::XStringAllocator(MemoryManager&  theManager, size_type	theBlockCount) :
 	m_allocator(theManager, theBlockCount)
 {
 }

Modified: xalan/c/trunk/src/xalanc/XPath/XStringAllocator.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/XStringAllocator.hpp?rev=699510&r1=699509&r2=699510&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/XStringAllocator.hpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/XStringAllocator.hpp Fri Sep 26 14:34:43 2008
@@ -52,7 +52,7 @@
 	 *
 	 * @param theBlockSize The block size.
 	 */
-	XStringAllocator(MemoryManagerType&  theManager, size_type	theBlockCount);
+	XStringAllocator(MemoryManager&  theManager, size_type	theBlockCount);
 
 	~XStringAllocator();
 

Modified: xalan/c/trunk/src/xalanc/XPath/XStringReference.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/XStringReference.hpp?rev=699510&r1=699509&r2=699510&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/XStringReference.hpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/XStringReference.hpp Fri Sep 26 14:34:43 2008
@@ -49,10 +49,10 @@
 	 * @param value      source string
 	 */
 	XStringReference(const XalanDOMString&	val,
-                        MemoryManagerType&  theManager);
+                        MemoryManager&  theManager);
 
 	XStringReference(const XStringReference&	source,
-                        MemoryManagerType&      theManager);
+                        MemoryManager&      theManager);
 
 	virtual
 	~XStringReference();

Modified: xalan/c/trunk/src/xalanc/XPath/XTokenStringAdapterAllocator.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/XTokenStringAdapterAllocator.cpp?rev=699510&r1=699509&r2=699510&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/XTokenStringAdapterAllocator.cpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/XTokenStringAdapterAllocator.cpp Fri Sep 26 14:34:43 2008
@@ -25,7 +25,7 @@
 
 
 
-XTokenStringAdapterAllocator::XTokenStringAdapterAllocator(MemoryManagerType&  theManager, size_type	theBlockCount) :
+XTokenStringAdapterAllocator::XTokenStringAdapterAllocator(MemoryManager&  theManager, size_type	theBlockCount) :
 	m_allocator(theManager, theBlockCount)
 {
 }

Modified: xalan/c/trunk/src/xalanc/XPath/XTokenStringAdapterAllocator.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/XTokenStringAdapterAllocator.hpp?rev=699510&r1=699509&r2=699510&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/XTokenStringAdapterAllocator.hpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/XTokenStringAdapterAllocator.hpp Fri Sep 26 14:34:43 2008
@@ -52,7 +52,7 @@
 	 *
 	 * @param theBlockSize The block size.
 	 */
-	XTokenStringAdapterAllocator(MemoryManagerType&  theManager, size_type	theBlockCount);
+	XTokenStringAdapterAllocator(MemoryManager&  theManager, size_type	theBlockCount);
 
 	~XTokenStringAdapterAllocator();
 

Modified: xalan/c/trunk/src/xalanc/XPath/XUnknown.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/XUnknown.hpp?rev=699510&r1=699509&r2=699510&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/XUnknown.hpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/XUnknown.hpp Fri Sep 26 14:34:43 2008
@@ -48,7 +48,7 @@
 	 * Perform static initialization.  See class XPathInit.
 	 */
 	static void
-	initialize(MemoryManagerType& theManager);
+	initialize(MemoryManager& theManager);
 
 	/**
 	 * Perform static shut down.  See class XPathInit.

Modified: xalan/c/trunk/src/xalanc/XPath/XalanQNameByValueAllocator.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/XalanQNameByValueAllocator.hpp?rev=699510&r1=699509&r2=699510&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/XalanQNameByValueAllocator.hpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/XalanQNameByValueAllocator.hpp Fri Sep 26 14:34:43 2008
@@ -61,7 +61,7 @@
 	 *
 	 * @param theBlockSize The block size.
 	 */
-	XalanQNameByValueAllocator(MemoryManagerType&      theManager, size_type		theBlockCount);
+	XalanQNameByValueAllocator(MemoryManager&      theManager, size_type		theBlockCount);
 
 	~XalanQNameByValueAllocator();
 	

Modified: xalan/c/trunk/src/xalanc/XSLT/Constants.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/Constants.cpp?rev=699510&r1=699509&r2=699510&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/Constants.cpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/Constants.cpp Fri Sep 26 14:34:43 2008
@@ -286,7 +286,7 @@
 
 
 void
-Constants::initialize(MemoryManagerType&  theManager)
+Constants::initialize(MemoryManager&  theManager)
 {
 
 	::ATTRNAME_CASEORDER.reset( theManager, "case-order");
@@ -420,7 +420,7 @@
 void
 Constants::terminate()
 {
-    MemoryManagerType& theManager = XalanMemMgrs::getDummyMemMgr();
+    MemoryManager& theManager = XalanMemMgrs::getDummyMemMgr();
 
 	releaseMemory(::ATTRNAME_CASEORDER, theManager );
 	releaseMemory(::ATTRNAME_COUNT, theManager );

Modified: xalan/c/trunk/src/xalanc/XSLT/Constants.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/Constants.hpp?rev=699510&r1=699509&r2=699510&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/Constants.hpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/Constants.hpp Fri Sep 26 14:34:43 2008
@@ -45,7 +45,7 @@
 	 * processing occurs.  See class XSLTInit.
 	 */
 	static void
-	initialize(MemoryManagerType&  theManager);
+	initialize(MemoryManager&  theManager);
 
 	/**
 	 * Perform termination of statics.  See class XSLTInit.

Modified: xalan/c/trunk/src/xalanc/XSLT/CountersTable.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/CountersTable.hpp?rev=699510&r1=699509&r2=699510&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/CountersTable.hpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/CountersTable.hpp Fri Sep 26 14:34:43 2008
@@ -85,7 +85,7 @@
 	 * Construct a counter object.
 	 */
 	Counter(
-            MemoryManagerType&  theManager,
+            MemoryManager&  theManager,
 			const ElemNumber*	numberElem,
 			NodeVectorType&		countNodes) :
 		m_countNodesStartCount(0),
@@ -98,7 +98,7 @@
 	/**
 	 * Construct a counter object.
 	 */
-	Counter(MemoryManagerType& theManager, const ElemNumber*	numberElem = 0) :
+	Counter(MemoryManager& theManager, const ElemNumber*	numberElem = 0) :
 		m_countNodesStartCount(0),
 		m_countNodes(theManager),
 		m_fromNode(0),
@@ -106,7 +106,7 @@
 	{
 	}
 
-	Counter(const Counter& other, MemoryManagerType& theManager) :
+	Counter(const Counter& other, MemoryManager& theManager) :
 		m_countNodesStartCount(other.m_countNodesStartCount),
 		m_countNodes(other.m_countNodes, theManager),
 		m_fromNode(other.m_fromNode),
@@ -168,7 +168,7 @@
 	/**
 	 * Construct a CountersTable.
 	 */
-	CountersTable(MemoryManagerType& theManager,
+	CountersTable(MemoryManager& theManager,
                     unsigned long		theSize = 0) :
 		m_countersVector(theManager),
 		m_newFound(theManager)

Modified: xalan/c/trunk/src/xalanc/XSLT/ElemExtensionCall.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/ElemExtensionCall.hpp?rev=699510&r1=699509&r2=699510&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/ElemExtensionCall.hpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/ElemExtensionCall.hpp Fri Sep 26 14:34:43 2008
@@ -65,7 +65,7 @@
 
 	static ElemExtensionCall*
     create(
-            MemoryManagerType&              theManager,
+            MemoryManager&              theManager,
 			StylesheetConstructionContext&	constructionContext,
 			Stylesheet&						stylesheetTree,
 			const XalanDOMChar*				name,

Modified: xalan/c/trunk/src/xalanc/XSLT/ElemForEach.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/ElemForEach.cpp?rev=699510&r1=699509&r2=699510&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/ElemForEach.cpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/ElemForEach.cpp Fri Sep 26 14:34:43 2008
@@ -133,7 +133,7 @@
 {
     XALAN_USING_STD(for_each)
 
-     MemoryManagerType& theManager = m_sortElems.getMemoryManager();
+     MemoryManager& theManager = m_sortElems.getMemoryManager();
 
     for_each(m_sortElems.begin(),
              m_sortElems.end(),

Modified: xalan/c/trunk/src/xalanc/XSLT/ElemForwardCompatible.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/ElemForwardCompatible.cpp?rev=699510&r1=699509&r2=699510&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/ElemForwardCompatible.cpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/ElemForwardCompatible.cpp Fri Sep 26 14:34:43 2008
@@ -88,7 +88,7 @@
 
 ElemForwardCompatible*
 ElemForwardCompatible::create(
-            MemoryManagerType&              theManager,
+            MemoryManager&              theManager,
             StylesheetConstructionContext&  constructionContext,
             Stylesheet&                     stylesheetTree,
             const XalanDOMChar*             name,

Modified: xalan/c/trunk/src/xalanc/XSLT/ElemForwardCompatible.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/ElemForwardCompatible.hpp?rev=699510&r1=699509&r2=699510&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/ElemForwardCompatible.hpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/ElemForwardCompatible.hpp Fri Sep 26 14:34:43 2008
@@ -58,7 +58,7 @@
 
     static ElemForwardCompatible*
     create(
-            MemoryManagerType&              theManager,
+            MemoryManager&              theManager,
 			StylesheetConstructionContext&	constructionContext,
 			Stylesheet&						stylesheetTree,
 			const XalanDOMChar*				name,

Modified: xalan/c/trunk/src/xalanc/XSLT/ElemNumber.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/ElemNumber.cpp?rev=699510&r1=699509&r2=699510&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/ElemNumber.cpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/ElemNumber.cpp Fri Sep 26 14:34:43 2008
@@ -179,7 +179,7 @@
 
 ElemNumber*
 ElemNumber::create(
-            MemoryManagerType&              theManager,
+            MemoryManager&              theManager,
             StylesheetConstructionContext&  constructionContext,
             Stylesheet&                     stylesheetTree,
             const AttributeListType&        atts,
@@ -1972,7 +1972,7 @@
 
 static void
 initializeTraditionalElalphaBundle(
-            MemoryManagerType&              theManager, 
+            MemoryManager&              theManager, 
             XalanNumberingResourceBundle&   theBundle)
 {
 
@@ -2145,7 +2145,7 @@
 
 
 void
-ElemNumber::initialize(MemoryManagerType&  theManager)
+ElemNumber::initialize(MemoryManager&  theManager)
 {
     s_staticTextString.reset(theManager, s_textStringChars);
 
@@ -2161,7 +2161,7 @@
 void
 ElemNumber::terminate()
 {
-    MemoryManagerType& theManager = XalanMemMgrs::getDummyMemMgr();
+    MemoryManager& theManager = XalanMemMgrs::getDummyMemMgr();
 
     releaseMemory(s_staticTextString, theManager);
     releaseMemory(s_staticCommentString, theManager);

Modified: xalan/c/trunk/src/xalanc/XSLT/ElemNumber.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/ElemNumber.hpp?rev=699510&r1=699509&r2=699510&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/ElemNumber.hpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/ElemNumber.hpp Fri Sep 26 14:34:43 2008
@@ -75,7 +75,7 @@
 	 * Perform static initialization.  See class XSLTInit.
 	 */
 	static void
-	initialize(MemoryManagerType&  theManager);
+	initialize(MemoryManager&  theManager);
 
 	/**
 	 * Perform static shut down.  See class XSLTInit.
@@ -103,7 +103,7 @@
 
     static ElemNumber*
     create(
-            MemoryManagerType&              theManager,
+            MemoryManager&              theManager,
 			StylesheetConstructionContext&	constructionContext,
 			Stylesheet&						stylesheetTree,
 			const AttributeListType&		atts,

Modified: xalan/c/trunk/src/xalanc/XSLT/ElemSort.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/ElemSort.cpp?rev=699510&r1=699509&r2=699510&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/ElemSort.cpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/ElemSort.cpp Fri Sep 26 14:34:43 2008
@@ -124,7 +124,7 @@
 
 ElemSort*
 ElemSort::create(
-            MemoryManagerType& theManager,
+            MemoryManager& theManager,
             StylesheetConstructionContext&  constructionContext,
             Stylesheet&                     stylesheetTree,
             const AttributeListType&        atts,

Modified: xalan/c/trunk/src/xalanc/XSLT/ElemSort.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/ElemSort.hpp?rev=699510&r1=699509&r2=699510&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/ElemSort.hpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/ElemSort.hpp Fri Sep 26 14:34:43 2008
@@ -66,7 +66,7 @@
 
     static ElemSort*
 	create(
-            MemoryManagerType& theManager,
+            MemoryManager& theManager,
 			StylesheetConstructionContext&	constructionContext,
 			Stylesheet&						stylesheetTree,
 			const AttributeListType&		atts,

Modified: xalan/c/trunk/src/xalanc/XSLT/ExtensionFunctionHandler.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/ExtensionFunctionHandler.cpp?rev=699510&r1=699509&r2=699510&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/ExtensionFunctionHandler.cpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/ExtensionFunctionHandler.cpp Fri Sep 26 14:34:43 2008
@@ -45,7 +45,7 @@
 
 
 ExtensionFunctionHandler::ExtensionFunctionHandler(const XalanDOMString&	namespaceUri,
-                                                   MemoryManagerType& theManager) :
+                                                   MemoryManager& theManager) :
 	m_namespaceUri(namespaceUri,theManager),
 	m_scriptLang(theManager),
 	m_scriptSrc(theManager),
@@ -65,7 +65,7 @@
 
 
 ExtensionFunctionHandler::ExtensionFunctionHandler (
-            MemoryManagerType&      theManager,
+            MemoryManager&      theManager,
 			const XalanDOMString&	namespaceUri,
 			const XalanDOMString&	funcNames,
 			const XalanDOMString&	lang,

Modified: xalan/c/trunk/src/xalanc/XSLT/ExtensionFunctionHandler.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/ExtensionFunctionHandler.hpp?rev=699510&r1=699509&r2=699510&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/ExtensionFunctionHandler.hpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/ExtensionFunctionHandler.hpp Fri Sep 26 14:34:43 2008
@@ -69,7 +69,7 @@
 	 * @param namespaceUri the extension namespace URI that I'm implementing
 	 */
 	ExtensionFunctionHandler(const XalanDOMString&	namespaceUri,
-                            MemoryManagerType& theManager);
+                            MemoryManager& theManager);
 
 	/**
 	 * Construct a new extension namespace handler given all the information
@@ -84,7 +84,7 @@
 	 * @param scriptSrc    the actual script code (if any)
 	 */
 	ExtensionFunctionHandler(
-            MemoryManagerType& theManager,
+            MemoryManager& theManager,
 			const XalanDOMString&	namespaceUri,
 			const XalanDOMString&	funcNames,
 			const XalanDOMString&	lang,
@@ -95,7 +95,7 @@
 	virtual
 	~ExtensionFunctionHandler();
 
-    MemoryManagerType&
+    MemoryManager&
     getMemoryManager()
     {
         return m_namespaceUri.getMemoryManager();

Modified: xalan/c/trunk/src/xalanc/XSLT/ExtensionNSHandler.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/ExtensionNSHandler.cpp?rev=699510&r1=699509&r2=699510&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/ExtensionNSHandler.cpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/ExtensionNSHandler.cpp Fri Sep 26 14:34:43 2008
@@ -76,7 +76,7 @@
  * @param namespaceUri the extension namespace URI that I'm implementing
  */
 ExtensionNSHandler::ExtensionNSHandler(const XalanDOMString&	namespaceUri,
-                                       MemoryManagerType& theManager) :
+                                       MemoryManager& theManager) :
 	ExtensionFunctionHandler(namespaceUri, theManager),
 	m_elements(theManager),
 	m_componentDescLoaded(false)
@@ -85,7 +85,7 @@
 
 ExtensionNSHandler*
 ExtensionNSHandler::create(const XalanDOMString&	namespaceUri,
-                           MemoryManagerType&       theManager)
+                           MemoryManager&       theManager)
 {
     typedef ExtensionNSHandler ThisType;
 
@@ -101,7 +101,7 @@
 }
 
 ExtensionNSHandler::ExtensionNSHandler (
-            MemoryManagerType&    theManager,
+            MemoryManager&    theManager,
 			const XalanDOMString& namespaceUri,
 			const XalanDOMString& elemNames,
 			const XalanDOMString& funcNames,

Modified: xalan/c/trunk/src/xalanc/XSLT/FunctionCurrent.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/FunctionCurrent.cpp?rev=699510&r1=699509&r2=699510&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/FunctionCurrent.cpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/FunctionCurrent.cpp Fri Sep 26 14:34:43 2008
@@ -61,7 +61,7 @@
 #else
 FunctionCurrent*
 #endif
-FunctionCurrent::clone(MemoryManagerType&   theManager) const
+FunctionCurrent::clone(MemoryManager&   theManager) const
 {
     return XalanCopyConstruct(theManager, *this);
 }

Modified: xalan/c/trunk/src/xalanc/XSLT/FunctionCurrent.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/FunctionCurrent.hpp?rev=699510&r1=699509&r2=699510&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/FunctionCurrent.hpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/FunctionCurrent.hpp Fri Sep 26 14:34:43 2008
@@ -66,7 +66,7 @@
 #else
 	virtual FunctionCurrent*
 #endif
-	clone(MemoryManagerType& theManager) const;
+	clone(MemoryManager& theManager) const;
 
 private:
 

Modified: xalan/c/trunk/src/xalanc/XSLT/FunctionDocument.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/FunctionDocument.hpp?rev=699510&r1=699509&r2=699510&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/FunctionDocument.hpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/FunctionDocument.hpp Fri Sep 26 14:34:43 2008
@@ -70,7 +70,7 @@
 #else
 	virtual FunctionDocument*
 #endif
-	clone(MemoryManagerType& theManager) const;
+	clone(MemoryManager& theManager) const;
 
 protected:
 

Modified: xalan/c/trunk/src/xalanc/XSLT/FunctionElementAvailable.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/FunctionElementAvailable.cpp?rev=699510&r1=699509&r2=699510&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/FunctionElementAvailable.cpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/FunctionElementAvailable.cpp Fri Sep 26 14:34:43 2008
@@ -64,7 +64,7 @@
 #else
 FunctionElementAvailable*
 #endif
-FunctionElementAvailable::clone(MemoryManagerType& theManager) const
+FunctionElementAvailable::clone(MemoryManager& theManager) const
 {
     return XalanCopyConstruct(theManager, *this);
 }

Modified: xalan/c/trunk/src/xalanc/XSLT/FunctionElementAvailable.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/FunctionElementAvailable.hpp?rev=699510&r1=699509&r2=699510&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/FunctionElementAvailable.hpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/FunctionElementAvailable.hpp Fri Sep 26 14:34:43 2008
@@ -67,7 +67,7 @@
 #else
 	virtual FunctionElementAvailable*
 #endif
-	clone(MemoryManagerType& theManager) const;
+	clone(MemoryManager& theManager) const;
 
 private:
 	

Modified: xalan/c/trunk/src/xalanc/XSLT/FunctionFormatNumber.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/FunctionFormatNumber.cpp?rev=699510&r1=699509&r2=699510&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/FunctionFormatNumber.cpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/FunctionFormatNumber.cpp Fri Sep 26 14:34:43 2008
@@ -104,7 +104,7 @@
 #else
 FunctionFormatNumber*
 #endif
-FunctionFormatNumber::clone(MemoryManagerType&  theManager) const
+FunctionFormatNumber::clone(MemoryManager&  theManager) const
 {
     return XalanCopyConstruct(theManager, *this);
 }

Modified: xalan/c/trunk/src/xalanc/XSLT/FunctionFormatNumber.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/FunctionFormatNumber.hpp?rev=699510&r1=699509&r2=699510&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/FunctionFormatNumber.hpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/FunctionFormatNumber.hpp Fri Sep 26 14:34:43 2008
@@ -70,7 +70,7 @@
 #else
 	virtual FunctionFormatNumber*
 #endif
-	clone(MemoryManagerType& theManager) const;
+	clone(MemoryManager& theManager) const;
 
 private:
 

Modified: xalan/c/trunk/src/xalanc/XSLT/FunctionFunctionAvailable.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/FunctionFunctionAvailable.cpp?rev=699510&r1=699509&r2=699510&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/FunctionFunctionAvailable.cpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/FunctionFunctionAvailable.cpp Fri Sep 26 14:34:43 2008
@@ -66,7 +66,7 @@
 #else
 FunctionFunctionAvailable*
 #endif
-FunctionFunctionAvailable::clone(MemoryManagerType&     theManager) const
+FunctionFunctionAvailable::clone(MemoryManager&     theManager) const
 {
     return XalanCopyConstruct(theManager, *this);
 }

Modified: xalan/c/trunk/src/xalanc/XSLT/FunctionFunctionAvailable.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/FunctionFunctionAvailable.hpp?rev=699510&r1=699509&r2=699510&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/FunctionFunctionAvailable.hpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/FunctionFunctionAvailable.hpp Fri Sep 26 14:34:43 2008
@@ -67,7 +67,7 @@
 #else
 	virtual FunctionFunctionAvailable*
 #endif
-	clone(MemoryManagerType& theManager) const;
+	clone(MemoryManager& theManager) const;
 
 protected:
 

Modified: xalan/c/trunk/src/xalanc/XSLT/FunctionGenerateID.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/FunctionGenerateID.cpp?rev=699510&r1=699509&r2=699510&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/FunctionGenerateID.cpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/FunctionGenerateID.cpp Fri Sep 26 14:34:43 2008
@@ -137,7 +137,7 @@
 #else
 FunctionGenerateID*
 #endif
-FunctionGenerateID::clone(MemoryManagerType&    theManager) const
+FunctionGenerateID::clone(MemoryManager&    theManager) const
 {
     return XalanCopyConstruct(theManager, *this);
 }

Modified: xalan/c/trunk/src/xalanc/XSLT/FunctionGenerateID.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/FunctionGenerateID.hpp?rev=699510&r1=699509&r2=699510&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/FunctionGenerateID.hpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/FunctionGenerateID.hpp Fri Sep 26 14:34:43 2008
@@ -70,7 +70,7 @@
 #else
 	virtual FunctionGenerateID*
 #endif
-	clone(MemoryManagerType& theManager) const;
+	clone(MemoryManager& theManager) const;
 
 protected:
 

Modified: xalan/c/trunk/src/xalanc/XSLT/FunctionKey.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/FunctionKey.hpp?rev=699510&r1=699509&r2=699510&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/FunctionKey.hpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/FunctionKey.hpp Fri Sep 26 14:34:43 2008
@@ -68,7 +68,7 @@
 #else
 	virtual FunctionKey*
 #endif
-	clone(MemoryManagerType& theManager) const;
+	clone(MemoryManager& theManager) const;
 
 protected:
 

Modified: xalan/c/trunk/src/xalanc/XSLT/FunctionSystemProperty.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/FunctionSystemProperty.cpp?rev=699510&r1=699509&r2=699510&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/FunctionSystemProperty.cpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/FunctionSystemProperty.cpp Fri Sep 26 14:34:43 2008
@@ -44,7 +44,7 @@
 
 
 
-FunctionSystemProperty::FunctionSystemProperty(MemoryManagerType&   theManager) :
+FunctionSystemProperty::FunctionSystemProperty(MemoryManager&   theManager) :
     Function(),
     m_xsltNamespaceURI("http://www.w3.org/1999/XSL/Transform", theManager),
     m_versionPropertyString("version", theManager),
@@ -59,7 +59,7 @@
 
 FunctionSystemProperty::FunctionSystemProperty(
             const FunctionSystemProperty&   other, 
-            MemoryManagerType&              theManager) :
+            MemoryManager&              theManager) :
     Function(other),
     m_xsltNamespaceURI(other.m_xsltNamespaceURI, theManager),
     m_versionPropertyString(other.m_versionPropertyString, theManager),
@@ -207,7 +207,7 @@
 #else
 FunctionSystemProperty*
 #endif
-FunctionSystemProperty::clone(MemoryManagerType&    theManager) const
+FunctionSystemProperty::clone(MemoryManager&    theManager) const
 {
     return XalanCopyConstruct(theManager, *this, theManager);
 }

Modified: xalan/c/trunk/src/xalanc/XSLT/FunctionSystemProperty.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/FunctionSystemProperty.hpp?rev=699510&r1=699509&r2=699510&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/FunctionSystemProperty.hpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/FunctionSystemProperty.hpp Fri Sep 26 14:34:43 2008
@@ -41,9 +41,9 @@
 
 	typedef Function	ParentType;
 
-	FunctionSystemProperty(MemoryManagerType& theManager);
+	FunctionSystemProperty(MemoryManager& theManager);
 
-    FunctionSystemProperty( const FunctionSystemProperty& other, MemoryManagerType& theManager);
+    FunctionSystemProperty( const FunctionSystemProperty& other, MemoryManager& theManager);
 
 	virtual
 	~FunctionSystemProperty();
@@ -64,7 +64,7 @@
 #else
 	virtual FunctionSystemProperty*
 #endif
-	clone(MemoryManagerType& theManager) const;
+	clone(MemoryManager& theManager) const;
 
 protected:
 

Modified: xalan/c/trunk/src/xalanc/XSLT/FunctionUnparsedEntityURI.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/FunctionUnparsedEntityURI.cpp?rev=699510&r1=699509&r2=699510&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/FunctionUnparsedEntityURI.cpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/FunctionUnparsedEntityURI.cpp Fri Sep 26 14:34:43 2008
@@ -96,7 +96,7 @@
 #else
 FunctionUnparsedEntityURI*
 #endif
-FunctionUnparsedEntityURI::clone(MemoryManagerType&     theManager) const
+FunctionUnparsedEntityURI::clone(MemoryManager&     theManager) const
 {
    return XalanCopyConstruct(theManager, *this);
 }

Modified: xalan/c/trunk/src/xalanc/XSLT/FunctionUnparsedEntityURI.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/FunctionUnparsedEntityURI.hpp?rev=699510&r1=699509&r2=699510&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/FunctionUnparsedEntityURI.hpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/FunctionUnparsedEntityURI.hpp Fri Sep 26 14:34:43 2008
@@ -63,7 +63,7 @@
 #else
 	virtual FunctionUnparsedEntityURI*
 #endif
-	clone(MemoryManagerType& theManager) const;
+	clone(MemoryManager& theManager) const;
 
 protected:
 

Modified: xalan/c/trunk/src/xalanc/XSLT/GenerateEvent.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/GenerateEvent.cpp?rev=699510&r1=699509&r2=699510&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/GenerateEvent.cpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/GenerateEvent.cpp Fri Sep 26 14:34:43 2008
@@ -23,7 +23,7 @@
 
 
 
-GenerateEvent::GenerateEvent(EventType	eventType, MemoryManagerType& theManager) :
+GenerateEvent::GenerateEvent(EventType	eventType, MemoryManager& theManager) :
 	m_eventType(eventType),
 	m_characters(theManager),
 	m_start(0),
@@ -38,7 +38,7 @@
 
 GenerateEvent::GenerateEvent(
 			EventType				eventType,
-            MemoryManagerType&      theManager,
+            MemoryManager&      theManager,
 			const XalanDOMChar*		name,
 			AttributeListType*		atts) :
 	m_eventType(eventType),
@@ -55,7 +55,7 @@
 
 GenerateEvent::GenerateEvent(
 			EventType					eventType,
-            MemoryManagerType&          theManager,
+            MemoryManager&          theManager,
 			const XalanDOMString&		name,
 			const AttributeListType*	atts) :
 	m_eventType(eventType),
@@ -71,7 +71,7 @@
 
 GenerateEvent::GenerateEvent(
 			EventType					eventType,
-            MemoryManagerType&          theManager,
+            MemoryManager&          theManager,
 			const XalanDOMChar*			ch,
 			XalanDOMString::size_type	start,
 			XalanDOMString::size_type	length) :
@@ -89,7 +89,7 @@
 
 GenerateEvent::GenerateEvent(
 			EventType				eventType,
-            MemoryManagerType&      theManager,
+            MemoryManager&      theManager,
 			const XalanDOMChar*		name,
 			const XalanDOMChar*		data) :
 	m_eventType(eventType),
@@ -106,7 +106,7 @@
 
 GenerateEvent::GenerateEvent(
 			EventType				eventType,
-            MemoryManagerType&      theManager,
+            MemoryManager&      theManager,
 			const XalanDOMChar*		data) :
 	m_eventType(eventType),
 	m_characters(theManager),

Modified: xalan/c/trunk/src/xalanc/XSLT/GenerateEvent.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/GenerateEvent.hpp?rev=699510&r1=699509&r2=699510&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/GenerateEvent.hpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/GenerateEvent.hpp Fri Sep 26 14:34:43 2008
@@ -114,7 +114,7 @@
 	 * @param eventType one of the EVENTTYPE_XXX constants
 	 */
 	GenerateEvent(EventType		        eventType,
-                  MemoryManagerType&    theManager);
+                  MemoryManager&    theManager);
 	
 	/** 
 	* Constructor for startElement, endElement events.
@@ -125,7 +125,7 @@
 	*/
 	GenerateEvent(
 			EventType				eventType,
-            MemoryManagerType&      theManager,
+            MemoryManager&      theManager,
 			const XalanDOMChar*		name,
 			AttributeListType*		atts);
 
@@ -138,7 +138,7 @@
 	*/
 	GenerateEvent(
 			EventType					eventType,
-            MemoryManagerType&          theManager,
+            MemoryManager&          theManager,
 			const XalanDOMString&		name,
 			const AttributeListType*	atts = 0);
 
@@ -152,7 +152,7 @@
 	*/
 	GenerateEvent(
 			EventType					eventType,
-            MemoryManagerType&          theManager,
+            MemoryManager&          theManager,
 			const XalanDOMChar*			ch,
 			XalanDOMString::size_type	start,
 			XalanDOMString::size_type	length);
@@ -166,7 +166,7 @@
 	*/
 	GenerateEvent(
 			EventType				eventType,
-            MemoryManagerType&      theManager,
+            MemoryManager&      theManager,
 			const XalanDOMChar*		name,
 			const XalanDOMChar*		data);
 	
@@ -179,7 +179,7 @@
 	*/
 	GenerateEvent(
 			EventType				eventType,
-            MemoryManagerType&      theManager,
+            MemoryManager&      theManager,
 			const XalanDOMChar*		data);
 
 	/** 

Modified: xalan/c/trunk/src/xalanc/XSLT/KeyTable.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/KeyTable.cpp?rev=699510&r1=699509&r2=699510&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/KeyTable.cpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/KeyTable.cpp Fri Sep 26 14:34:43 2008
@@ -199,7 +199,7 @@
 } // end constructor
 
 KeyTable*
-KeyTable::create(MemoryManagerType& theManager,
+KeyTable::create(MemoryManager& theManager,
             XalanNode*                          startNode,
             const PrefixResolver&               resolver,
             const KeyDeclarationVectorType&     keyDeclarations,

Modified: xalan/c/trunk/src/xalanc/XSLT/KeyTable.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/KeyTable.hpp?rev=699510&r1=699509&r2=699510&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/KeyTable.hpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/KeyTable.hpp Fri Sep 26 14:34:43 2008
@@ -95,7 +95,7 @@
 			StylesheetExecutionContext&			executionContext);
 
     static KeyTable*
-    create(MemoryManagerType& theManager,
+    create(MemoryManager& theManager,
 			XalanNode*							startNode,
 			const PrefixResolver&				resolver,
 			const KeyDeclarationVectorType&		keyDeclarations,

Modified: xalan/c/trunk/src/xalanc/XSLT/NamespacesHandler.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/NamespacesHandler.cpp?rev=699510&r1=699509&r2=699510&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/NamespacesHandler.cpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/NamespacesHandler.cpp Fri Sep 26 14:34:43 2008
@@ -243,7 +243,7 @@
 
 
 
-NamespacesHandler::NamespacesHandler(MemoryManagerType& theManager) :
+NamespacesHandler::NamespacesHandler(MemoryManager& theManager) :
     m_excludedResultPrefixes(theManager),
     m_namespaceDeclarations(theManager),
     m_extensionNamespaceURIs(theManager),

Modified: xalan/c/trunk/src/xalanc/XSLT/NodeSorter.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/NodeSorter.cpp?rev=699510&r1=699509&r2=699510&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/NodeSorter.cpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/NodeSorter.cpp Fri Sep 26 14:34:43 2008
@@ -46,7 +46,7 @@
 
 
 
-NodeSorter::NodeSorter(MemoryManagerType& theManager) :
+NodeSorter::NodeSorter(MemoryManager& theManager) :
 	m_numberResultsCache(theManager),
 	m_stringResultsCache(theManager),
 	m_keys(theManager),

Modified: xalan/c/trunk/src/xalanc/XSLT/NodeSorter.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/NodeSorter.hpp?rev=699510&r1=699509&r2=699510&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/NodeSorter.hpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/NodeSorter.hpp Fri Sep 26 14:34:43 2008
@@ -89,7 +89,7 @@
 	typedef XalanVector<NodeSortKey>			NodeSortKeyVectorType;
 
 	explicit
-	NodeSorter(MemoryManagerType& theManager);
+	NodeSorter(MemoryManager& theManager);
   
 	~NodeSorter();
 

Modified: xalan/c/trunk/src/xalanc/XSLT/OutputContextStack.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/OutputContextStack.cpp?rev=699510&r1=699509&r2=699510&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/OutputContextStack.cpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/OutputContextStack.cpp Fri Sep 26 14:34:43 2008
@@ -28,7 +28,7 @@
 
 
 
-OutputContextStack::OutputContextStack(MemoryManagerType& theManager) :
+OutputContextStack::OutputContextStack(MemoryManager& theManager) :
 	m_stack(theManager, 1 ),
 	m_stackPosition(m_stack.begin()),
 	m_stackSize(0)

Modified: xalan/c/trunk/src/xalanc/XSLT/OutputContextStack.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/OutputContextStack.hpp?rev=699510&r1=699509&r2=699510&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/OutputContextStack.hpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/OutputContextStack.hpp Fri Sep 26 14:34:43 2008
@@ -52,7 +52,7 @@
 
 	struct OutputContext
 	{
-		OutputContext(MemoryManagerType&      theManager,
+		OutputContext(MemoryManager&      theManager,
                     FormatterListener*	theListener = 0) :
 			m_flistener(theListener),
 			m_pendingAttributes(theManager),
@@ -63,7 +63,7 @@
 		}
 
 		OutputContext( const OutputContext&		other, 
-			MemoryManagerType&      theManager) :
+			MemoryManager&      theManager) :
 			m_flistener(other.m_flistener),
 			m_pendingAttributes(other.m_pendingAttributes , theManager),
 			m_pendingElementName(other.m_pendingElementName , theManager),
@@ -106,7 +106,7 @@
 	typedef OutputContextStackType::size_type	size_type;
 
 	explicit
-	OutputContextStack(MemoryManagerType& theManager);
+	OutputContextStack(MemoryManager& theManager);
 
 	~OutputContextStack();
 

Modified: xalan/c/trunk/src/xalanc/XSLT/ResultNamespacesStack.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/ResultNamespacesStack.cpp?rev=699510&r1=699509&r2=699510&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/ResultNamespacesStack.cpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/ResultNamespacesStack.cpp Fri Sep 26 14:34:43 2008
@@ -25,7 +25,7 @@
 
 
 
-ResultNamespacesStack::ResultNamespacesStack(MemoryManagerType& theManager) :
+ResultNamespacesStack::ResultNamespacesStack(MemoryManager& theManager) :
 	m_resultNamespaces(theManager, 1),
 	m_stackBegin(m_resultNamespaces.begin()),
 	m_stackPosition(m_stackBegin),

Modified: xalan/c/trunk/src/xalanc/XSLT/ResultNamespacesStack.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/ResultNamespacesStack.hpp?rev=699510&r1=699509&r2=699510&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/ResultNamespacesStack.hpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/ResultNamespacesStack.hpp Fri Sep 26 14:34:43 2008
@@ -63,7 +63,7 @@
 
 
 	explicit
-	ResultNamespacesStack(MemoryManagerType& theManager);
+	ResultNamespacesStack(MemoryManager& theManager);
 
 	~ResultNamespacesStack();
 

Modified: xalan/c/trunk/src/xalanc/XSLT/Stylesheet.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/Stylesheet.cpp?rev=699510&r1=699509&r2=699510&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/Stylesheet.cpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/Stylesheet.cpp Fri Sep 26 14:34:43 2008
@@ -154,7 +154,7 @@
     
 Stylesheet*
 Stylesheet::create(
-            MemoryManagerType&              theManager,
+            MemoryManager&              theManager,
             StylesheetRoot&                 root,
             const XalanDOMString&           baseIdentifier,
             StylesheetConstructionContext&  constructionContext)

Modified: xalan/c/trunk/src/xalanc/XSLT/Stylesheet.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/Stylesheet.hpp?rev=699510&r1=699509&r2=699510&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/Stylesheet.hpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/Stylesheet.hpp Fri Sep 26 14:34:43 2008
@@ -125,12 +125,12 @@
     ~Stylesheet();
 
     static Stylesheet*
-    create(MemoryManagerType& theManager,
+    create(MemoryManager& theManager,
             StylesheetRoot&                 root,
             const XalanDOMString&           baseIdentifier,
             StylesheetConstructionContext&  constructionContext);
 
-    MemoryManagerType&
+    MemoryManager&
     getMemoryManager()
     {
         return m_elementPatternTable.getMemoryManager();

Modified: xalan/c/trunk/src/xalanc/XSLT/StylesheetConstructionContext.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/StylesheetConstructionContext.cpp?rev=699510&r1=699509&r2=699510&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/StylesheetConstructionContext.cpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/StylesheetConstructionContext.cpp Fri Sep 26 14:34:43 2008
@@ -24,7 +24,7 @@
 
 
 
-StylesheetConstructionContext::StylesheetConstructionContext(MemoryManagerType&  theManager) :
+StylesheetConstructionContext::StylesheetConstructionContext(MemoryManager&  theManager) :
 	XPathConstructionContext(theManager)
 {
 }

Modified: xalan/c/trunk/src/xalanc/XSLT/StylesheetConstructionContextDefault.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/StylesheetConstructionContextDefault.cpp?rev=699510&r1=699509&r2=699510&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/StylesheetConstructionContextDefault.cpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/StylesheetConstructionContextDefault.cpp Fri Sep 26 14:34:43 2008
@@ -76,7 +76,7 @@
 
 
 StylesheetConstructionContextDefault::StylesheetConstructionContextDefault(
-            MemoryManagerType&                      theManager,
+            MemoryManager&                      theManager,
             XSLTEngineImpl&                         processor,
             XPathFactory&                           xpathFactory,
             VectorAllocatorSizeType                 theXalanDOMCharVectorAllocatorBlockSize,
@@ -648,7 +648,7 @@
 
     Type*
     operator()(         
-        MemoryManagerType&              theManager,
+        MemoryManager&              theManager,
         StylesheetConstructionContext&  constructionContext,
         Stylesheet&                     stylesheetTree,
         const AttributeListType&        atts,

Modified: xalan/c/trunk/src/xalanc/XSLT/StylesheetConstructionContextDefault.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/StylesheetConstructionContextDefault.hpp?rev=699510&r1=699509&r2=699510&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/StylesheetConstructionContextDefault.hpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/StylesheetConstructionContextDefault.hpp Fri Sep 26 14:34:43 2008
@@ -142,7 +142,7 @@
 	 * @param thePointerVectorAllocatorBlockSize The block size to use for allocating vectors of pointers.
 	 */
 	StylesheetConstructionContextDefault(
-            MemoryManagerType&                      theManager,
+            MemoryManager&                      theManager,
 			XSLTEngineImpl&							processor,
 			XPathFactory&							xpathFactory,
 			VectorAllocatorSizeType					theXalanDOMCharVectorAllocatorBlockSize = eDefaultXalanDOMCharVectorBlockSize,

Modified: xalan/c/trunk/src/xalanc/XSLT/StylesheetExecutionContext.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/StylesheetExecutionContext.cpp?rev=699510&r1=699509&r2=699510&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/StylesheetExecutionContext.cpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/StylesheetExecutionContext.cpp Fri Sep 26 14:34:43 2008
@@ -32,7 +32,7 @@
 
 
 
-StylesheetExecutionContext::StylesheetExecutionContext(MemoryManagerType& m_memoryManager, XObjectFactory*	theXObjectFactory) :
+StylesheetExecutionContext::StylesheetExecutionContext(MemoryManager& m_memoryManager, XObjectFactory*	theXObjectFactory) :
 	XPathExecutionContext(m_memoryManager, theXObjectFactory)
 {
 }

Modified: xalan/c/trunk/src/xalanc/XSLT/StylesheetExecutionContext.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/StylesheetExecutionContext.hpp?rev=699510&r1=699509&r2=699510&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/StylesheetExecutionContext.hpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/StylesheetExecutionContext.hpp Fri Sep 26 14:34:43 2008
@@ -1869,7 +1869,7 @@
 
     virtual XalanDocument*
     parseXML(
-            MemoryManagerType&      theManager,
+            MemoryManager&      theManager,
             const XalanDOMString&   urlString,
             const XalanDOMString&   base,
             ErrorHandler*           theErrorHandler = 0) const = 0;
@@ -1881,7 +1881,7 @@
     returnMutableNodeRefList(MutableNodeRefList*    theList) = 0;
 
     virtual MutableNodeRefList*
-    createMutableNodeRefList(MemoryManagerType& theManager) const = 0;
+    createMutableNodeRefList(MemoryManager& theManager) const = 0;
 
 #if !defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
 

Modified: xalan/c/trunk/src/xalanc/XSLT/StylesheetExecutionContextDefault.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/StylesheetExecutionContextDefault.cpp?rev=699510&r1=699509&r2=699510&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/StylesheetExecutionContextDefault.cpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/StylesheetExecutionContextDefault.cpp Fri Sep 26 14:34:43 2008
@@ -94,7 +94,7 @@
 
 
 StylesheetExecutionContextDefault::StylesheetExecutionContextDefault(
-            MemoryManagerType&      theManager,
+            MemoryManager&      theManager,
             XSLTEngineImpl&         xsltProcessor,
             XPathEnvSupport&        theXPathEnvSupport,
             DOMSupport&             theDOMSupport,
@@ -162,7 +162,7 @@
 
 
 StylesheetExecutionContextDefault::StylesheetExecutionContextDefault(
-            MemoryManagerType&      theManager,
+            MemoryManager&      theManager,
             XalanNode*              theCurrentNode,
             const NodeRefListBase*  theContextNodeList,
             const PrefixResolver*   thePrefixResolver) :
@@ -225,7 +225,7 @@
 
 StylesheetExecutionContextDefault*
 StylesheetExecutionContextDefault::create(
-            MemoryManagerType&      theManager,
+            MemoryManager&      theManager,
             XalanNode*              theCurrentNode,
             const NodeRefListBase*  theContextNodeList,
             const PrefixResolver*   thePrefixResolver)
@@ -1551,7 +1551,7 @@
 
 
 XalanNumberFormat*
-StylesheetExecutionContextDefault::XalanNumberFormatFactory::create(MemoryManagerType& theManager)
+StylesheetExecutionContextDefault::XalanNumberFormatFactory::create(MemoryManager& theManager)
 {
     return XalanNumberFormat::create(theManager);
 }
@@ -2052,7 +2052,7 @@
 
 XalanDocument*
 StylesheetExecutionContextDefault::parseXML(
-            MemoryManagerType&      theManager,
+            MemoryManager&      theManager,
             const XalanDOMString&   urlString,
             const XalanDOMString&   base,
             ErrorHandler*           theErrorHandler) const
@@ -2105,7 +2105,7 @@
 
 
 MutableNodeRefList*
-StylesheetExecutionContextDefault::createMutableNodeRefList(MemoryManagerType& theManager) const
+StylesheetExecutionContextDefault::createMutableNodeRefList(MemoryManager& theManager) const
 {
     return m_xpathExecutionContextDefault.createMutableNodeRefList(theManager);
 }
@@ -2518,7 +2518,7 @@
 
 
 XalanSourceTreeDocument*
-StylesheetExecutionContextDefault::getSourceTreeFactory(MemoryManagerType& theManager) const
+StylesheetExecutionContextDefault::getSourceTreeFactory(MemoryManager& theManager) const
 {
     assert(m_xsltProcessor != 0);
 

Modified: xalan/c/trunk/src/xalanc/XSLT/StylesheetExecutionContextDefault.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/StylesheetExecutionContextDefault.hpp?rev=699510&r1=699509&r2=699510&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/StylesheetExecutionContextDefault.hpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/StylesheetExecutionContextDefault.hpp Fri Sep 26 14:34:43 2008
@@ -118,7 +118,7 @@
      * @param thePrefixResolver  pointer to prefix resolver to use
      */ 
     StylesheetExecutionContextDefault(
-            MemoryManagerType&      theManager,
+            MemoryManager&      theManager,
             XSLTEngineImpl&         xsltProcessor,
             XPathEnvSupport&        theXPathEnvSupport,
             DOMSupport&             theDOMSupport,
@@ -139,14 +139,14 @@
      */
     explicit
     StylesheetExecutionContextDefault(
-            MemoryManagerType&      theManager,
+            MemoryManager&      theManager,
             XalanNode*              theCurrentNode = 0,
             const NodeRefListBase*  theContextNodeList = 0,
             const PrefixResolver*   thePrefixResolver = 0);
 
     static StylesheetExecutionContextDefault*
     create(
-            MemoryManagerType&      theManager,
+            MemoryManager&      theManager,
             XalanNode*              theCurrentNode = 0,
             const NodeRefListBase*  theContextNodeList = 0,
             const PrefixResolver*   thePrefixResolver = 0);
@@ -606,7 +606,7 @@
         ~XalanNumberFormatFactory();
 
         virtual XalanNumberFormat*
-        create(MemoryManagerType& theManager);
+        create(MemoryManager& theManager);
     };
 
     static XalanNumberFormatFactory&
@@ -840,7 +840,7 @@
 
     virtual XalanDocument*
     parseXML(
-            MemoryManagerType&      theManager,
+            MemoryManager&      theManager,
             const XalanDOMString&   urlString,
             const XalanDOMString&   base,
             ErrorHandler*           theErrorHandler = 0) const;
@@ -852,7 +852,7 @@
     returnMutableNodeRefList(MutableNodeRefList*    theList);
 
     virtual MutableNodeRefList*
-    createMutableNodeRefList(MemoryManagerType& theManager) const;
+    createMutableNodeRefList(MemoryManager& theManager) const;
 
 #if !defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
     virtual void
@@ -998,7 +998,7 @@
      * tree fragments.
      */
     XalanSourceTreeDocument*
-    getSourceTreeFactory(MemoryManagerType& theManager) const;
+    getSourceTreeFactory(MemoryManager& theManager) const;
 
 #if defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
 protected:
@@ -1153,7 +1153,7 @@
     {
     public:
 
-        FormatterToTextDOMString(MemoryManagerType& theManager);
+        FormatterToTextDOMString(MemoryManager& theManager);
 
         virtual
         ~FormatterToTextDOMString();

Modified: xalan/c/trunk/src/xalanc/XSLT/StylesheetHandler.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/StylesheetHandler.cpp?rev=699510&r1=699509&r2=699510&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/StylesheetHandler.cpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/StylesheetHandler.cpp Fri Sep 26 14:34:43 2008
@@ -1985,7 +1985,7 @@
 
 
 void
-StylesheetHandler::initialize(MemoryManagerType& /* theManager*/)
+StylesheetHandler::initialize(MemoryManager& /* theManager*/)
 {
 }
 

Modified: xalan/c/trunk/src/xalanc/XSLT/StylesheetHandler.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/StylesheetHandler.hpp?rev=699510&r1=699509&r2=699510&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/StylesheetHandler.hpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/StylesheetHandler.hpp Fri Sep 26 14:34:43 2008
@@ -83,7 +83,7 @@
      * Perform static initialization.  See class XMLSupportInit.
      */
     static void
-    initialize(MemoryManagerType&  theManager);
+    initialize(MemoryManager&  theManager);
 
     /**
      * Perform static shut down.  See class XMLSupportInit.
@@ -99,7 +99,7 @@
             Stylesheet&                     stylesheetTree,
             StylesheetConstructionContext&  constructionContext);
 
-    MemoryManagerType&
+    MemoryManager&
     getMemoryManager()
     {
         return m_constructionContext.getMemoryManager();

Modified: xalan/c/trunk/src/xalanc/XSLT/StylesheetRoot.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/StylesheetRoot.cpp?rev=699510&r1=699509&r2=699510&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/StylesheetRoot.cpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/StylesheetRoot.cpp Fri Sep 26 14:34:43 2008
@@ -117,7 +117,7 @@
 
 StylesheetRoot*
 StylesheetRoot::create(
-                           MemoryManagerType&              theManager,
+                           MemoryManager&              theManager,
                            const XalanDOMString&            baseIdentifier,
                            StylesheetConstructionContext&   constructionContext)
 {

Modified: xalan/c/trunk/src/xalanc/XSLT/StylesheetRoot.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/StylesheetRoot.hpp?rev=699510&r1=699509&r2=699510&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/StylesheetRoot.hpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/StylesheetRoot.hpp Fri Sep 26 14:34:43 2008
@@ -86,11 +86,11 @@
 
     static StylesheetRoot*
     create(
-        MemoryManagerType&              theManager,
+        MemoryManager&              theManager,
         const XalanDOMString&			baseIdentifier,
         StylesheetConstructionContext&	constructionContext);
 
-    MemoryManagerType&
+    MemoryManager&
     getMemoryManager()
     {
         return m_version.getMemoryManager();

Modified: xalan/c/trunk/src/xalanc/XSLT/TopLevelArg.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/TopLevelArg.cpp?rev=699510&r1=699509&r2=699510&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/TopLevelArg.cpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/TopLevelArg.cpp Fri Sep 26 14:34:43 2008
@@ -25,7 +25,7 @@
 
 
 TopLevelArg::TopLevelArg(
-        MemoryManagerType&      theManager,
+        MemoryManager&      theManager,
 		const XalanQName&		name,
 		const XalanDOMString&	expr) :
 	m_qname(name, theManager),
@@ -35,7 +35,7 @@
 }
 TopLevelArg*
 TopLevelArg::create(
-        MemoryManagerType&      theManager,
+        MemoryManager&      theManager,
 		const XalanQName&		name,
 		const XalanDOMString&	expr)
 {
@@ -53,7 +53,7 @@
 }
 
 TopLevelArg::TopLevelArg(
-        MemoryManagerType&  theManager,
+        MemoryManager&  theManager,
 		const XalanQName&	name,
 		const XObjectPtr	variable) :
 	m_qname(name, theManager),
@@ -64,7 +64,7 @@
 
 TopLevelArg*
 TopLevelArg::create(
-        MemoryManagerType&      theManager,
+        MemoryManager&      theManager,
 		const XalanQName&		name,
 		const XObjectPtr	    variable)
 {
@@ -83,7 +83,7 @@
 
 
 TopLevelArg::TopLevelArg(const TopLevelArg&		theSource,
-                         MemoryManagerType&     theManager) :
+                         MemoryManager&     theManager) :
 	m_qname(theSource.m_qname, theManager),
 	m_expression(theSource.m_expression, theManager),
 	m_xobject(theSource.m_xobject)

Modified: xalan/c/trunk/src/xalanc/XSLT/TopLevelArg.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/TopLevelArg.hpp?rev=699510&r1=699509&r2=699510&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/TopLevelArg.hpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/TopLevelArg.hpp Fri Sep 26 14:34:43 2008
@@ -58,13 +58,13 @@
 	 * @param expr	expression argument represents
 	 */
 	TopLevelArg(
-        MemoryManagerType&      theManager,
+        MemoryManager&      theManager,
 		const XalanQName&		name,
 		const XalanDOMString&	expr);
 
 	static TopLevelArg*
     create(
-        MemoryManagerType&      theManager,
+        MemoryManager&      theManager,
 		const XalanQName&		name,
 		const XalanDOMString&	expr);
 	/**
@@ -74,13 +74,13 @@
 	 * @param variable	the XObject instance.
 	 */
 	TopLevelArg(
-        MemoryManagerType&  theManager,
+        MemoryManager&  theManager,
 		const XalanQName&	name,
 		const XObjectPtr	variable = XObjectPtr());
 
 	static TopLevelArg*
     create(
-        MemoryManagerType&      theManager,
+        MemoryManager&      theManager,
 		const XalanQName&		name,
 		const XObjectPtr	variable = XObjectPtr());
 	/**
@@ -90,7 +90,7 @@
 	 */
 	TopLevelArg(
                 const TopLevelArg&	theSource,
-                MemoryManagerType&  theManager);
+                MemoryManager&  theManager);
 
 
 	/**

Modified: xalan/c/trunk/src/xalanc/XSLT/VariablesStack.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/VariablesStack.cpp?rev=699510&r1=699509&r2=699510&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/VariablesStack.cpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/VariablesStack.cpp Fri Sep 26 14:34:43 2008
@@ -40,7 +40,7 @@
 
 
 
-VariablesStack::VariablesStack(MemoryManagerType& theManager) :
+VariablesStack::VariablesStack(MemoryManager& theManager) :
     m_stack(theManager),
     m_globalStackFrameIndex(~0u),
     m_globalStackFrameMarked(false),

Modified: xalan/c/trunk/src/xalanc/XSLT/VariablesStack.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/VariablesStack.hpp?rev=699510&r1=699509&r2=699510&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/VariablesStack.hpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/VariablesStack.hpp Fri Sep 26 14:34:43 2008
@@ -67,7 +67,7 @@
 	 * Constructor for a variable stack.
 	 */
 	explicit
-	VariablesStack(MemoryManagerType& theManager);
+	VariablesStack(MemoryManager& theManager);
 
 	~VariablesStack();
 

Modified: xalan/c/trunk/src/xalanc/XSLT/XResultTreeFragAllocator.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/XResultTreeFragAllocator.cpp?rev=699510&r1=699509&r2=699510&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/XResultTreeFragAllocator.cpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/XResultTreeFragAllocator.cpp Fri Sep 26 14:34:43 2008
@@ -25,7 +25,7 @@
 
 
 
-XResultTreeFragAllocator::XResultTreeFragAllocator(MemoryManagerType&  theManager, size_type	theBlockCount) :
+XResultTreeFragAllocator::XResultTreeFragAllocator(MemoryManager&  theManager, size_type	theBlockCount) :
 	m_allocator(theManager, theBlockCount)
 {
 }

Modified: xalan/c/trunk/src/xalanc/XSLT/XResultTreeFragAllocator.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/XResultTreeFragAllocator.hpp?rev=699510&r1=699509&r2=699510&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/XResultTreeFragAllocator.hpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/XResultTreeFragAllocator.hpp Fri Sep 26 14:34:43 2008
@@ -52,7 +52,7 @@
 	 *
 	 * @param theBlockSize The block size.
 	 */
-	XResultTreeFragAllocator(MemoryManagerType&  theManager, size_type	theBlockCount);
+	XResultTreeFragAllocator(MemoryManager&  theManager, size_type	theBlockCount);
 
 	~XResultTreeFragAllocator();
 	

Modified: xalan/c/trunk/src/xalanc/XSLT/XSLTEngineImpl.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/XSLTEngineImpl.cpp?rev=699510&r1=699509&r2=699510&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/XSLTEngineImpl.cpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/XSLTEngineImpl.cpp Fri Sep 26 14:34:43 2008
@@ -126,7 +126,7 @@
 //==========================================================
 
 XSLTEngineImpl::XSLTEngineImpl(
-            MemoryManagerType&  theManager,
+            MemoryManager&  theManager,
             XMLParserLiaison&   parserLiaison,
             XPathEnvSupport&    xpathEnvSupport,
             DOMSupport&         domSupport,
@@ -3192,7 +3192,7 @@
 
 
 void
-XSLTEngineImpl::installFunctions(MemoryManagerType& theManager)
+XSLTEngineImpl::installFunctions(MemoryManager& theManager)
 {
     XPath::installFunction(XPathFunctionTable::s_current, FunctionCurrent());
     XPath::installFunction(XPathFunctionTable::s_document, FunctionDocument());
@@ -3366,7 +3366,7 @@
 
 
 void
-XSLTEngineImpl::initialize(MemoryManagerType&      theManager)
+XSLTEngineImpl::initialize(MemoryManager&      theManager)
 {
     ::s_XSLNameSpaceURL.reset( theManager, "http://www.w3.org/1999/XSL/Transform");
 
@@ -3402,7 +3402,7 @@
 {
     uninstallFunctions();
 
-    MemoryManagerType& theManager = XalanMemMgrs::getDummyMemMgr();
+    MemoryManager& theManager = XalanMemMgrs::getDummyMemMgr();
 
     releaseMemory(::s_uniqueNamespacePrefix, theManager);
 

Modified: xalan/c/trunk/src/xalanc/XSLT/XSLTEngineImpl.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/XSLTEngineImpl.hpp?rev=699510&r1=699509&r2=699510&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/XSLTEngineImpl.hpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/XSLTEngineImpl.hpp Fri Sep 26 14:34:43 2008
@@ -201,7 +201,7 @@
      * @param xpathFactory     object responsible for XPath objects
      */
     XSLTEngineImpl(
-            MemoryManagerType&  theManager,
+            MemoryManager&  theManager,
             XMLParserLiaison&   parserLiaison,
             XPathEnvSupport&    xpathEnvSupport,
             DOMSupport&         domSupport,
@@ -1671,7 +1671,7 @@
     ParamMapType                        m_stylesheetParams;
 
     static void
-    installFunctions(MemoryManagerType& theManager);
+    installFunctions(MemoryManager& theManager);
 
     static void
     uninstallFunctions();

Modified: xalan/c/trunk/src/xalanc/XSLT/XSLTInit.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/XSLTInit.cpp?rev=699510&r1=699509&r2=699510&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/XSLTInit.cpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/XSLTInit.cpp Fri Sep 26 14:34:43 2008
@@ -33,9 +33,9 @@
 
 unsigned long	XSLTInit::s_initCounter = 0;
 
-static MemoryManagerType* s_staticMemoryManager = 0;
+static MemoryManager* s_staticMemoryManager = 0;
 
-XSLTInit::XSLTInit(MemoryManagerType&      theManager) :
+XSLTInit::XSLTInit(MemoryManager&      theManager) :
 	m_platformSupportInit(theManager),
 	m_domSupportInit(theManager),
 	m_xmlSupportInit(theManager),
@@ -51,7 +51,7 @@
 }
 
 XSLTInit*
-XSLTInit::create(MemoryManagerType&      theManager)
+XSLTInit::create(MemoryManager&      theManager)
 {
         typedef XSLTInit ThisType;
         
@@ -77,7 +77,7 @@
 	}
 }
 
-MemoryManagerType&
+MemoryManager&
 XSLTInit::getMemoryManager()
 {
     assert( s_staticMemoryManager !=0);
@@ -86,7 +86,7 @@
 }
 
 void
-XSLTInit::initialize(MemoryManagerType&  theManager)
+XSLTInit::initialize(MemoryManager&  theManager)
 {
 	Constants::initialize(theManager);
 

Modified: xalan/c/trunk/src/xalanc/XSLT/XSLTInit.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/XSLTInit.hpp?rev=699510&r1=699509&r2=699510&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/XSLTInit.hpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/XSLTInit.hpp Fri Sep 26 14:34:43 2008
@@ -55,14 +55,14 @@
 public:
 
 	explicit
-	XSLTInit(MemoryManagerType&      theManager);
+	XSLTInit(MemoryManager&      theManager);
 
 	~XSLTInit();
 
     static XSLTInit*
-    create(MemoryManagerType&      theManager);
+    create(MemoryManager&      theManager);
 
-    inline MemoryManagerType&
+    inline MemoryManager&
     getMemoryManager();
 
 
@@ -76,7 +76,7 @@
 
 	
 	static void
-	initialize(MemoryManagerType&      theManager);
+	initialize(MemoryManager&      theManager);
 
 	static void
 	terminate();

Modified: xalan/c/trunk/src/xalanc/XSLT/XSLTInputSource.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/XSLTInputSource.cpp?rev=699510&r1=699509&r2=699510&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/XSLTInputSource.cpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/XSLTInputSource.cpp Fri Sep 26 14:34:43 2008
@@ -242,7 +242,7 @@
 {
 	BinInputStreamType*		theResult = 0;
 
-    MemoryManagerType*  theManager = getMemoryManager();
+    MemoryManager*  theManager = getMemoryManager();
 
     assert(theManager != 0 );
 



---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org