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 [2/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/PlatformSupport/URISupport.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/URISupport.hpp?rev=699510&r1=699509&r2=699510&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/PlatformSupport/URISupport.hpp (original)
+++ xalan/c/trunk/src/xalanc/PlatformSupport/URISupport.hpp Fri Sep 26 14:34:43 2008
@@ -63,7 +63,7 @@
 	 */
 	static URLAutoPtrType
 	getURLFromString(const XalanDOMString&	urlString,
-                        MemoryManagerType&     theManager)
+                        MemoryManager&     theManager)
 	{
 		return getURLFromString(urlString.c_str(), theManager);
 	}
@@ -78,7 +78,7 @@
 	getURLFromString(
 			const XalanDOMString&	urlString,
 			XMLURLType&				url,
-            MemoryManagerType&      theManager)
+            MemoryManager&      theManager)
 	{
 		getURLFromString(urlString.c_str(), url, theManager);
 	}
@@ -91,7 +91,7 @@
 	 */
 	static URLAutoPtrType
 	getURLFromString(const XalanDOMChar*	    urlString,
-                        MemoryManagerType&     theManager);
+                        MemoryManager&     theManager);
 
 	/**
 	 * Determine the fully qualified URI for a string.
@@ -103,7 +103,7 @@
 	getURLFromString(
 			const XalanDOMChar*		urlString,
 			XMLURLType&				url,
-            MemoryManagerType&      theManager)
+            MemoryManager&      theManager)
 	{
         XalanDOMString buffer(theManager);
 
@@ -123,7 +123,7 @@
 	getURLFromString(
 			const XalanDOMString&	urlString,
 			const XalanDOMString&	base,
-            MemoryManagerType&  theManager)
+            MemoryManager&  theManager)
 	{
         XalanDOMString theResult(theManager);
 

Modified: xalan/c/trunk/src/xalanc/PlatformSupport/XalanAllocator.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/XalanAllocator.hpp?rev=699510&r1=699509&r2=699510&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/PlatformSupport/XalanAllocator.hpp (original)
+++ xalan/c/trunk/src/xalanc/PlatformSupport/XalanAllocator.hpp Fri Sep 26 14:34:43 2008
@@ -42,7 +42,7 @@
 	typedef Type			value_type;
 
 	
-	XalanAllocator(MemoryManagerType&      theManager) :
+	XalanAllocator(MemoryManager&      theManager) :
         m_memoryManager(theManager)
 	{
 	}
@@ -52,7 +52,7 @@
 	{
 	}
 	
-    MemoryManagerType&
+    MemoryManager&
     getMemoryManager()
     {
         return m_memoryManager;
@@ -117,7 +117,7 @@
     XalanAllocator<Type>&
     operator=(const XalanAllocator<Type>&);
     
-    MemoryManagerType&      m_memoryManager;
+    MemoryManager&      m_memoryManager;
 };
 
 

Modified: xalan/c/trunk/src/xalanc/PlatformSupport/XalanArrayAllocator.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/XalanArrayAllocator.hpp?rev=699510&r1=699509&r2=699510&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/PlatformSupport/XalanArrayAllocator.hpp (original)
+++ xalan/c/trunk/src/xalanc/PlatformSupport/XalanArrayAllocator.hpp Fri Sep 26 14:34:43 2008
@@ -61,7 +61,7 @@
 	 *
 	 * @param theBlockSize The block size when allocating.
 	 */
-	XalanArrayAllocator(MemoryManagerType&       theManager,
+	XalanArrayAllocator(MemoryManager&       theManager,
                         size_type	theBlockSize = eDefaultBlockSize) :
 		m_list(theManager),
 		m_blockSize(theBlockSize),
@@ -73,7 +73,7 @@
     {        
         typename ListType::iterator iter = m_list.begin();
 
-        MemoryManagerType& theManager = m_list.getMemoryManager();
+        MemoryManager& theManager = m_list.getMemoryManager();
 
         for( iter = m_list.begin(); iter != m_list.end(); ++iter)
         {

Modified: xalan/c/trunk/src/xalanc/PlatformSupport/XalanBitmap.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/XalanBitmap.cpp?rev=699510&r1=699509&r2=699510&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/PlatformSupport/XalanBitmap.cpp (original)
+++ xalan/c/trunk/src/xalanc/PlatformSupport/XalanBitmap.cpp Fri Sep 26 14:34:43 2008
@@ -34,7 +34,7 @@
 
 
 
-XalanBitmap::XalanBitmap(MemoryManagerType& theManager, size_type	theSize) :
+XalanBitmap::XalanBitmap(MemoryManager& theManager, size_type	theSize) :
 	m_size(theSize),
 	m_bitmap(size_type((theSize + eBitsPerUnit) / eBitsPerUnit), BitmapVectorType::value_type(0), theManager)
 {

Modified: xalan/c/trunk/src/xalanc/PlatformSupport/XalanBitmap.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/XalanBitmap.hpp?rev=699510&r1=699509&r2=699510&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/PlatformSupport/XalanBitmap.hpp (original)
+++ xalan/c/trunk/src/xalanc/PlatformSupport/XalanBitmap.hpp Fri Sep 26 14:34:43 2008
@@ -57,7 +57,7 @@
 	 *
 	 * @param  theSize   The number of bits in the map.
 	 */
-	XalanBitmap(MemoryManagerType& theManager, size_type	theSize);
+	XalanBitmap(MemoryManager& theManager, size_type	theSize);
 
 	~XalanBitmap();
 

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

Modified: xalan/c/trunk/src/xalanc/PlatformSupport/XalanDOMStringAllocator.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/XalanDOMStringAllocator.hpp?rev=699510&r1=699509&r2=699510&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/PlatformSupport/XalanDOMStringAllocator.hpp (original)
+++ xalan/c/trunk/src/xalanc/PlatformSupport/XalanDOMStringAllocator.hpp Fri Sep 26 14:34:43 2008
@@ -64,7 +64,7 @@
 	 *
 	 * @param theBlockSize The block size.
 	 */
-	XalanDOMStringAllocator(MemoryManagerType&      theManager, size_type	theBlockCount);
+	XalanDOMStringAllocator(MemoryManager&      theManager, size_type	theBlockCount);
 
 	~XalanDOMStringAllocator();
 
@@ -177,24 +177,24 @@
 	}
 
 	/**
-	 * Get a reference to the MemoryManagerType instance
+	 * Get a reference to the MemoryManager instance
 	 * for this instance.
 	 *
-	 * @return A reference to the MemoryManagerType instance.
+	 * @return A reference to the MemoryManager instance.
 	 */
-    MemoryManagerType&
+    MemoryManager&
     getMemoryManager()
     {
         return m_allocator.getMemoryManager();
     }
 
 	/**
-	 * Get a reference to the MemoryManagerType instance
+	 * Get a reference to the MemoryManager instance
 	 * for this instance.
 	 *
-	 * @return A reference to the MemoryManagerType instance.
+	 * @return A reference to the MemoryManager instance.
 	 */
-    const MemoryManagerType&
+    const MemoryManager&
     getMemoryManager() const
     {
         return m_allocator.getMemoryManager();

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

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

Modified: xalan/c/trunk/src/xalanc/PlatformSupport/XalanDOMStringHashTable.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/XalanDOMStringHashTable.hpp?rev=699510&r1=699509&r2=699510&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/PlatformSupport/XalanDOMStringHashTable.hpp (original)
+++ xalan/c/trunk/src/xalanc/PlatformSupport/XalanDOMStringHashTable.hpp Fri Sep 26 14:34:43 2008
@@ -58,7 +58,7 @@
 	 */
 	explicit
 	XalanDOMStringHashTable(
-            MemoryManagerType&  theManager,
+            MemoryManager&  theManager,
 			size_t				theBucketCount = eDefaultBucketCount,
 			bucket_size_type	theBucketSize = eDefaultBucketSize);
 

Modified: xalan/c/trunk/src/xalanc/PlatformSupport/XalanDOMStringPool.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/XalanDOMStringPool.hpp?rev=699510&r1=699509&r2=699510&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/PlatformSupport/XalanDOMStringPool.hpp (original)
+++ xalan/c/trunk/src/xalanc/PlatformSupport/XalanDOMStringPool.hpp Fri Sep 26 14:34:43 2008
@@ -59,14 +59,14 @@
 	 */
 	explicit
 	XalanDOMStringPool(
-            MemoryManagerType&  theManager,
+            MemoryManager&  theManager,
 			block_size_type		theBlockSize = eDefaultBlockSize,
 			bucket_count_type	theBucketCount = eDefaultBucketCount,
 			bucket_size_type	theBucketSize = eDefaultBucketSize);
 
     static XalanDOMStringPool*
     create(
-            MemoryManagerType&  theManager,
+            MemoryManager&  theManager,
 			block_size_type		theBlockSize = eDefaultBlockSize,
 			bucket_count_type	theBucketCount = eDefaultBucketCount,
 			bucket_size_type	theBucketSize = eDefaultBucketSize);
@@ -123,13 +123,13 @@
 		return m_hashTable;
 	}
 
-    MemoryManagerType&
+    MemoryManager&
     getMemoryManager()
     {
         return m_hashTable.getMemoryManager();
     }
 
-    const MemoryManagerType&
+    const MemoryManager&
     getMemoryManager() const
     {
         return m_hashTable.getMemoryManager();

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

Modified: xalan/c/trunk/src/xalanc/PlatformSupport/XalanDOMStringReusableAllocator.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/XalanDOMStringReusableAllocator.hpp?rev=699510&r1=699509&r2=699510&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/PlatformSupport/XalanDOMStringReusableAllocator.hpp (original)
+++ xalan/c/trunk/src/xalanc/PlatformSupport/XalanDOMStringReusableAllocator.hpp Fri Sep 26 14:34:43 2008
@@ -64,7 +64,7 @@
 	 *
 	 * @param theBlockSize The block size.
 	 */
-	XalanDOMStringReusableAllocator(MemoryManagerType&      theManager, size_type   theBlockCount);
+	XalanDOMStringReusableAllocator(MemoryManager&      theManager, size_type   theBlockCount);
 
 	~XalanDOMStringReusableAllocator();
 
@@ -187,24 +187,24 @@
 	}
 
 	/**
-	 * Get a reference to the MemoryManagerType instance
+	 * Get a reference to the MemoryManager instance
 	 * for this instance.
 	 *
-	 * @return A reference to the MemoryManagerType instance.
+	 * @return A reference to the MemoryManager instance.
 	 */
-    MemoryManagerType&
+    MemoryManager&
     getMemoryManager()
     {
         return m_allocator.getMemoryManager();
     }
 
 	/**
-	 * Get a reference to the MemoryManagerType instance
+	 * Get a reference to the MemoryManager instance
 	 * for this instance.
 	 *
-	 * @return A reference to the MemoryManagerType instance.
+	 * @return A reference to the MemoryManager instance.
 	 */
-    const MemoryManagerType&
+    const MemoryManager&
     getMemoryManager() const
     {
         return m_allocator.getMemoryManager();

Modified: xalan/c/trunk/src/xalanc/PlatformSupport/XalanDecimalFormatSymbols.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/XalanDecimalFormatSymbols.cpp?rev=699510&r1=699509&r2=699510&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/PlatformSupport/XalanDecimalFormatSymbols.cpp (original)
+++ xalan/c/trunk/src/xalanc/PlatformSupport/XalanDecimalFormatSymbols.cpp Fri Sep 26 14:34:43 2008
@@ -58,7 +58,7 @@
 
 
 
-XalanDecimalFormatSymbols::XalanDecimalFormatSymbols(MemoryManagerType&  theManager) :
+XalanDecimalFormatSymbols::XalanDecimalFormatSymbols(MemoryManager&  theManager) :
 	m_currencySymbol(theCurrencySymbol,theManager),
 	m_decimalSeparator(XalanUnicode::charFullStop),
 	m_digit(XalanUnicode::charNumberSign),
@@ -78,7 +78,7 @@
 
 
 XalanDecimalFormatSymbols::XalanDecimalFormatSymbols(const XalanDecimalFormatSymbols&	theSource,
-                                                     MemoryManagerType&                 theManager) :
+                                                     MemoryManager&                 theManager) :
 	m_currencySymbol(theSource.m_currencySymbol,theManager),
 	m_decimalSeparator(theSource.m_decimalSeparator),
 	m_digit(theSource.m_digit),

Modified: xalan/c/trunk/src/xalanc/PlatformSupport/XalanDecimalFormatSymbols.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/XalanDecimalFormatSymbols.hpp?rev=699510&r1=699509&r2=699510&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/PlatformSupport/XalanDecimalFormatSymbols.hpp (original)
+++ xalan/c/trunk/src/xalanc/PlatformSupport/XalanDecimalFormatSymbols.hpp Fri Sep 26 14:34:43 2008
@@ -45,10 +45,10 @@
 	// all of the stuff it needs to know.  But locales are implemented
 	// on all of our platforms yet.
 	explicit
-	XalanDecimalFormatSymbols(MemoryManagerType&  theManager);
+	XalanDecimalFormatSymbols(MemoryManager&  theManager);
 
 	XalanDecimalFormatSymbols(const XalanDecimalFormatSymbols&	theSource,
-                                MemoryManagerType&              theManager);
+                                MemoryManager&              theManager);
 
 	~XalanDecimalFormatSymbols();
 

Modified: xalan/c/trunk/src/xalanc/PlatformSupport/XalanEncodingPropertyCache.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/XalanEncodingPropertyCache.cpp?rev=699510&r1=699509&r2=699510&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/PlatformSupport/XalanEncodingPropertyCache.cpp (original)
+++ xalan/c/trunk/src/xalanc/PlatformSupport/XalanEncodingPropertyCache.cpp Fri Sep 26 14:34:43 2008
@@ -26,7 +26,7 @@
 
 
 XalanEncodingPropertyCache::XalanEncodingPropertyCache(
-            MemoryManagerType&              theManager,
+            MemoryManager&              theManager,
 			size_t							theCacheSize,
 			const XalanOutputTranscoder*	theTranscoder) :
 	m_transcoder(theTranscoder),

Modified: xalan/c/trunk/src/xalanc/PlatformSupport/XalanEncodingPropertyCache.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/XalanEncodingPropertyCache.hpp?rev=699510&r1=699509&r2=699510&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/PlatformSupport/XalanEncodingPropertyCache.hpp (original)
+++ xalan/c/trunk/src/xalanc/PlatformSupport/XalanEncodingPropertyCache.hpp Fri Sep 26 14:34:43 2008
@@ -46,7 +46,7 @@
 public:
 
 	XalanEncodingPropertyCache(
-            MemoryManagerType&                  theManager,
+            MemoryManager&                  theManager,
 			size_t								theCacheSize = XalanDOMChar(~0),
 			const XalanOutputTranscoder*		theTranscoder = 0);
 

Modified: xalan/c/trunk/src/xalanc/PlatformSupport/XalanFStreamOutputStream.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/XalanFStreamOutputStream.cpp?rev=699510&r1=699509&r2=699510&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/PlatformSupport/XalanFStreamOutputStream.cpp (original)
+++ xalan/c/trunk/src/xalanc/PlatformSupport/XalanFStreamOutputStream.cpp Fri Sep 26 14:34:43 2008
@@ -35,7 +35,7 @@
 
 XalanFStreamOutputStream::XalanFStreamOutputStream(
             FILE*               theHandle,
-            MemoryManagerType&  theManager,
+            MemoryManager&  theManager,
             size_type           theBufferSize) :
     XalanOutputStream(theManager, theBufferSize),
     m_handle(theHandle)
@@ -48,7 +48,7 @@
 XalanFStreamOutputStream*
 XalanFStreamOutputStream::create(
             FILE*               theFileHandle,
-            MemoryManagerType&  theManager,
+            MemoryManager&  theManager,
             size_type           theBufferSize)
 {
     typedef XalanFStreamOutputStream ThisType;

Modified: xalan/c/trunk/src/xalanc/PlatformSupport/XalanFStreamOutputStream.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/XalanFStreamOutputStream.hpp?rev=699510&r1=699509&r2=699510&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/PlatformSupport/XalanFStreamOutputStream.hpp (original)
+++ xalan/c/trunk/src/xalanc/PlatformSupport/XalanFStreamOutputStream.hpp Fri Sep 26 14:34:43 2008
@@ -53,13 +53,13 @@
 	 */
     XalanFStreamOutputStream(
 			FILE*			    theFileHandle,
-            MemoryManagerType&  theManager,
+            MemoryManager&  theManager,
 			size_type	        theBufferSize = eDefaultBufferSize);
 
     static XalanFStreamOutputStream*
     create(
             FILE*			    theFileHandle,
-            MemoryManagerType&  theManager,
+            MemoryManager&  theManager,
 			size_type	        theBufferSize = eDefaultBufferSize);
     virtual
 	~XalanFStreamOutputStream();

Modified: xalan/c/trunk/src/xalanc/PlatformSupport/XalanFileOutputStream.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/XalanFileOutputStream.cpp?rev=699510&r1=699509&r2=699510&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/PlatformSupport/XalanFileOutputStream.cpp (original)
+++ xalan/c/trunk/src/xalanc/PlatformSupport/XalanFileOutputStream.cpp Fri Sep 26 14:34:43 2008
@@ -226,7 +226,7 @@
 XalanFileOutputStream*
 XalanFileOutputStream::create(
             const XalanDOMString&   theFileName,
-            MemoryManagerType&      theManager,
+            MemoryManager&      theManager,
             size_type               theBufferSize)
 {
     typedef XalanFileOutputStream ThisType;

Modified: xalan/c/trunk/src/xalanc/PlatformSupport/XalanICUMessageLoader.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/XalanICUMessageLoader.cpp?rev=699510&r1=699509&r2=699510&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/PlatformSupport/XalanICUMessageLoader.cpp (original)
+++ xalan/c/trunk/src/xalanc/PlatformSupport/XalanICUMessageLoader.cpp Fri Sep 26 14:34:43 2008
@@ -119,7 +119,7 @@
 
 
 
-XalanICUMessageLoader::XalanICUMessageLoader(MemoryManagerType &theManager):
+XalanICUMessageLoader::XalanICUMessageLoader(MemoryManager &theManager):
 	m_localeBundle(0),
 	m_domainBundle(0),
 	m_unknownMessage("The message was not found in the ICU resource bundle.", theManager)

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

Modified: xalan/c/trunk/src/xalanc/PlatformSupport/XalanInMemoryMessageLoader.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/XalanInMemoryMessageLoader.cpp?rev=699510&r1=699509&r2=699510&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/PlatformSupport/XalanInMemoryMessageLoader.cpp (original)
+++ xalan/c/trunk/src/xalanc/PlatformSupport/XalanInMemoryMessageLoader.cpp Fri Sep 26 14:34:43 2008
@@ -80,7 +80,7 @@
 
 
 
-XalanInMemoryMessageLoader::XalanInMemoryMessageLoader(MemoryManagerType& theManager) :
+XalanInMemoryMessageLoader::XalanInMemoryMessageLoader(MemoryManager& theManager) :
 	m_unknownMessage("The message was not found in the message library.", theManager)
 {
 }

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

Modified: xalan/c/trunk/src/xalanc/PlatformSupport/XalanMessageLoader.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/XalanMessageLoader.cpp?rev=699510&r1=699509&r2=699510&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/PlatformSupport/XalanMessageLoader.cpp (original)
+++ xalan/c/trunk/src/xalanc/PlatformSupport/XalanMessageLoader.cpp Fri Sep 26 14:34:43 2008
@@ -49,7 +49,7 @@
 
 XalanMessageLoader*     XalanMessageLoader::s_msgLoader = 0;
 
-static MemoryManagerType*      s_initManager;
+static MemoryManager*      s_initManager;
 
 XalanMessageLoader::~XalanMessageLoader()
 {
@@ -58,7 +58,7 @@
 
 
 void
-XalanMessageLoader::initialize(MemoryManagerType&      theManager)
+XalanMessageLoader::initialize(MemoryManager&      theManager)
 {
 #if defined (XALAN_INMEM_MSG_LOADER)
         typedef XalanMessageLoader::XalanMessageLoaderCreateFunct <XalanInMemoryMessageLoader> LoaderCreatorType;
@@ -287,7 +287,7 @@
 bool 
 XalanMessageLoader::load(
             XalanMessages::Codes    msgToLoad,
-            MemoryManagerType&      theManager,
+            MemoryManager&      theManager,
             XalanDOMChar*           toFill,
             XalanSize_t             maxChars,
             const char*             repText1, 

Modified: xalan/c/trunk/src/xalanc/PlatformSupport/XalanMessageLoader.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/XalanMessageLoader.hpp?rev=699510&r1=699509&r2=699510&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/PlatformSupport/XalanMessageLoader.hpp (original)
+++ xalan/c/trunk/src/xalanc/PlatformSupport/XalanMessageLoader.hpp Fri Sep 26 14:34:43 2008
@@ -86,7 +86,7 @@
     }
 
     static void
-    initialize(MemoryManagerType&      theManager);
+    initialize(MemoryManager&      theManager);
 
     static void
     terminate();
@@ -159,7 +159,7 @@
     bool
     load(
                 XalanMessages::Codes        msgToLoad,
-                MemoryManagerType&          theManager,
+                MemoryManager&          theManager,
                 XalanDOMChar*               toFill, 
                 XalanSize_t                 maxChars, 
                 const char*                 repText1 , 

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

Modified: xalan/c/trunk/src/xalanc/PlatformSupport/XalanNLSMessageLoader.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/XalanNLSMessageLoader.hpp?rev=699510&r1=699509&r2=699510&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/PlatformSupport/XalanNLSMessageLoader.hpp (original)
+++ xalan/c/trunk/src/xalanc/PlatformSupport/XalanNLSMessageLoader.hpp Fri Sep 26 14:34:43 2008
@@ -32,7 +32,7 @@
 {
 public:
 
-	XalanNLSMessageLoader(MemoryManagerType& theManager);
+	XalanNLSMessageLoader(MemoryManager& theManager);
 
 	virtual
 	~XalanNLSMessageLoader();
@@ -59,7 +59,7 @@
  
     nl_catd 	m_catalogHandle;
     
-    MemoryManagerType& m_memoryManager;
+    MemoryManager& m_memoryManager;
 };
 
 XALAN_CPP_NAMESPACE_END

Modified: xalan/c/trunk/src/xalanc/PlatformSupport/XalanNamespace.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/XalanNamespace.hpp?rev=699510&r1=699509&r2=699510&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/PlatformSupport/XalanNamespace.hpp (original)
+++ xalan/c/trunk/src/xalanc/PlatformSupport/XalanNamespace.hpp Fri Sep 26 14:34:43 2008
@@ -38,7 +38,7 @@
 public:
 
 	explicit
-	XalanNamespace(MemoryManagerType&      theManager) :
+	XalanNamespace(MemoryManager&      theManager) :
 		m_prefix(theManager),
 		m_uri(theManager)
 	{
@@ -54,7 +54,7 @@
 	XalanNamespace(
 			const XalanDOMString&	thePrefix,
 			const XalanDOMString&	theURI,
-            MemoryManagerType&      theManager) :
+            MemoryManager&      theManager) :
 		m_prefix(thePrefix,theManager),
 		m_uri(theURI, theManager)
 	{
@@ -62,7 +62,7 @@
 
 	XalanNamespace(
             const XalanNamespace&   other,
-            MemoryManagerType&      theManager) :
+            MemoryManager&      theManager) :
 		m_prefix(other.m_prefix,theManager),
 		m_uri(other.m_uri, theManager)
 	{

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

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

Modified: xalan/c/trunk/src/xalanc/PlatformSupport/XalanNumberFormat.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/XalanNumberFormat.cpp?rev=699510&r1=699509&r2=699510&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/PlatformSupport/XalanNumberFormat.cpp (original)
+++ xalan/c/trunk/src/xalanc/PlatformSupport/XalanNumberFormat.cpp Fri Sep 26 14:34:43 2008
@@ -43,7 +43,7 @@
 
 
 
-XalanNumberFormat::XalanNumberFormat(MemoryManagerType&     theManager) :
+XalanNumberFormat::XalanNumberFormat(MemoryManager&     theManager) :
 	m_isGroupingUsed(false),
 	m_groupingSeparator(s_defaultGroupingSeparator, theManager),
 	m_groupingSize(3)	// Default to US values

Modified: xalan/c/trunk/src/xalanc/PlatformSupport/XalanNumberFormat.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/XalanNumberFormat.hpp?rev=699510&r1=699509&r2=699510&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/PlatformSupport/XalanNumberFormat.hpp (original)
+++ xalan/c/trunk/src/xalanc/PlatformSupport/XalanNumberFormat.hpp Fri Sep 26 14:34:43 2008
@@ -38,10 +38,10 @@
 public:
 
 	explicit
-	XalanNumberFormat(MemoryManagerType&      theManager);
+	XalanNumberFormat(MemoryManager&      theManager);
 
     static XalanNumberFormat*
-    create(MemoryManagerType&      theManager)
+    create(MemoryManager&      theManager)
     {
         XalanNumberFormat*  theInstance;
 
@@ -54,7 +54,7 @@
 	virtual
 	~XalanNumberFormat();
 
-    MemoryManagerType&
+    MemoryManager&
     getMemoryManager()
     {
         return m_groupingSeparator.getMemoryManager();

Modified: xalan/c/trunk/src/xalanc/PlatformSupport/XalanOutputStream.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/XalanOutputStream.cpp?rev=699510&r1=699509&r2=699510&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/PlatformSupport/XalanOutputStream.cpp (original)
+++ xalan/c/trunk/src/xalanc/PlatformSupport/XalanOutputStream.cpp Fri Sep 26 14:34:43 2008
@@ -65,7 +65,7 @@
 
 
 XalanOutputStream::XalanOutputStream(
-            MemoryManagerType&      theManager,
+            MemoryManager&      theManager,
             size_type               theBufferSize,
             size_type               theTranscoderBlockSize,
             bool                    fThrowTranscodeException) :

Modified: xalan/c/trunk/src/xalanc/PlatformSupport/XalanOutputStream.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/XalanOutputStream.hpp?rev=699510&r1=699509&r2=699510&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/PlatformSupport/XalanOutputStream.hpp (original)
+++ xalan/c/trunk/src/xalanc/PlatformSupport/XalanOutputStream.hpp Fri Sep 26 14:34:43 2008
@@ -65,7 +65,7 @@
 	 */
 	explicit
 	XalanOutputStream(
-            MemoryManagerType&  theManager,
+            MemoryManager&  theManager,
 			size_type	        theBufferSize = eDefaultBufferSize,
 			size_type	        theTranscoderBlockSize = eDefaultTranscoderBlockSize,
 			bool		        fThrowTranscodeException = true);
@@ -73,7 +73,7 @@
 	virtual
 	~XalanOutputStream();
 
-    MemoryManagerType& 
+    MemoryManager& 
     getMemoryManager()
     {
         return m_buffer.getMemoryManager();

Modified: xalan/c/trunk/src/xalanc/PlatformSupport/XalanOutputStreamPrintWriter.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/XalanOutputStreamPrintWriter.cpp?rev=699510&r1=699509&r2=699510&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/PlatformSupport/XalanOutputStreamPrintWriter.cpp (original)
+++ xalan/c/trunk/src/xalanc/PlatformSupport/XalanOutputStreamPrintWriter.cpp Fri Sep 26 14:34:43 2008
@@ -53,7 +53,7 @@
 {
     typedef XalanOutputStreamPrintWriter ThisType;
 
-    MemoryManagerType& theManager = theOutputStream.getMemoryManager();
+    MemoryManager& theManager = theOutputStream.getMemoryManager();
 
     XalanMemMgrAutoPtr<ThisType, false> theGuard( theManager , (ThisType*)theManager.allocate(sizeof(ThisType)));
 

Modified: xalan/c/trunk/src/xalanc/PlatformSupport/XalanParsedURI.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/XalanParsedURI.hpp?rev=699510&r1=699509&r2=699510&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/PlatformSupport/XalanParsedURI.hpp (original)
+++ xalan/c/trunk/src/xalanc/PlatformSupport/XalanParsedURI.hpp Fri Sep 26 14:34:43 2008
@@ -62,7 +62,7 @@
 	/** 
 	 * Default constructor 
 	 */
-	XalanParsedURI(MemoryManagerType&      theManager) :
+	XalanParsedURI(MemoryManager&      theManager) :
         m_scheme(theManager),
         m_authority(theManager),
         m_path(theManager),
@@ -81,7 +81,7 @@
 	XalanParsedURI(
 		const XalanDOMChar*			uriString,
 		XalanDOMString::size_type	uriStringLen,
-        MemoryManagerType&          theManager) : 
+        MemoryManager&          theManager) : 
         m_scheme(theManager),
         m_authority(theManager),
         m_path(theManager),
@@ -99,7 +99,7 @@
 	 */
 	XalanParsedURI(
 		const XalanDOMString		&uriString,
-        MemoryManagerType&          theManager) :
+        MemoryManager&          theManager) :
         m_scheme(theManager),
         m_authority(theManager),
         m_path(theManager),
@@ -110,7 +110,7 @@
 		parse(uriString.c_str(), uriString.length());
 	}
 
-    MemoryManagerType&
+    MemoryManager&
     getMemoryManager()
     {
         return m_scheme.getMemoryManager();

Modified: xalan/c/trunk/src/xalanc/PlatformSupport/XalanStdOutputStream.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/XalanStdOutputStream.cpp?rev=699510&r1=699509&r2=699510&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/PlatformSupport/XalanStdOutputStream.cpp (original)
+++ xalan/c/trunk/src/xalanc/PlatformSupport/XalanStdOutputStream.cpp Fri Sep 26 14:34:43 2008
@@ -40,7 +40,7 @@
 
 
 XalanStdOutputStream::XalanStdOutputStream(StreamType&  theOutputStream,
-                                           MemoryManagerType&  theManager) :
+                                           MemoryManager&  theManager) :
     XalanOutputStream(theManager),
 #if !defined(XALAN_NEWLINE_IS_CRLF)
     m_outputStream(theOutputStream)

Modified: xalan/c/trunk/src/xalanc/PlatformSupport/XalanStdOutputStream.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/XalanStdOutputStream.hpp?rev=699510&r1=699509&r2=699510&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/PlatformSupport/XalanStdOutputStream.hpp (original)
+++ xalan/c/trunk/src/xalanc/PlatformSupport/XalanStdOutputStream.hpp Fri Sep 26 14:34:43 2008
@@ -71,11 +71,11 @@
      * @param theOutputStream output stream to use
      */
     XalanStdOutputStream(StreamType&    theOutputStream,
-                         MemoryManagerType&  theManager XALAN_DEFAULT_MEMMGR);
+                         MemoryManager&  theManager XALAN_DEFAULT_MEMMGR);
 
     static XalanStdOutputStream*
     create( StreamType& theOutputStream,
-            MemoryManagerType&  theManager);
+            MemoryManager&  theManager);
 
     virtual
     ~XalanStdOutputStream();

Modified: xalan/c/trunk/src/xalanc/PlatformSupport/XalanToXercesTranscoderWrapper.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/XalanToXercesTranscoderWrapper.cpp?rev=699510&r1=699509&r2=699510&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/PlatformSupport/XalanToXercesTranscoderWrapper.cpp (original)
+++ xalan/c/trunk/src/xalanc/PlatformSupport/XalanToXercesTranscoderWrapper.cpp Fri Sep 26 14:34:43 2008
@@ -37,14 +37,14 @@
 
 
 
-XalanToXercesTranscoderWrapper::XalanToXercesTranscoderWrapper(MemoryManagerType& theManager, XMLTranscoderType&	theTranscoder) :
+XalanToXercesTranscoderWrapper::XalanToXercesTranscoderWrapper(MemoryManager& theManager, XMLTranscoderType&	theTranscoder) :
 	XalanOutputTranscoder(theManager),
 	m_transcoder(&theTranscoder)
 {
 }
 
 XalanToXercesTranscoderWrapper*
-XalanToXercesTranscoderWrapper::create(MemoryManagerType& theManager, XMLTranscoderType&	theTranscoder)
+XalanToXercesTranscoderWrapper::create(MemoryManager& theManager, XMLTranscoderType&	theTranscoder)
 {
     typedef XalanToXercesTranscoderWrapper ThisType;
 

Modified: xalan/c/trunk/src/xalanc/PlatformSupport/XalanToXercesTranscoderWrapper.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/XalanToXercesTranscoderWrapper.hpp?rev=699510&r1=699509&r2=699510&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/PlatformSupport/XalanToXercesTranscoderWrapper.hpp (original)
+++ xalan/c/trunk/src/xalanc/PlatformSupport/XalanToXercesTranscoderWrapper.hpp Fri Sep 26 14:34:43 2008
@@ -45,10 +45,10 @@
 	typedef XERCES_CPP_NAMESPACE_QUALIFIER XMLTranscoder	XMLTranscoderType;
 
 	explicit
-	XalanToXercesTranscoderWrapper(MemoryManagerType& theManager, XMLTranscoderType&	theTranscoder);
+	XalanToXercesTranscoderWrapper(MemoryManager& theManager, XMLTranscoderType&	theTranscoder);
 
     static XalanToXercesTranscoderWrapper*
-    create(MemoryManagerType& theManager, XMLTranscoderType&	theTranscoder);
+    create(MemoryManager& theManager, XMLTranscoderType&	theTranscoder);
 
 	virtual
 	~XalanToXercesTranscoderWrapper();

Modified: xalan/c/trunk/src/xalanc/PlatformSupport/XalanTranscodingServices.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/XalanTranscodingServices.cpp?rev=699510&r1=699509&r2=699510&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/PlatformSupport/XalanTranscodingServices.cpp (original)
+++ xalan/c/trunk/src/xalanc/PlatformSupport/XalanTranscodingServices.cpp Fri Sep 26 14:34:43 2008
@@ -242,7 +242,7 @@
 
 XalanOutputTranscoder*
 XalanTranscodingServices::makeNewTranscoder(
-            MemoryManagerType&      theManager,
+            MemoryManager&      theManager,
             const XalanDOMString&   theEncodingName,
             eCode&                  theResult,
             size_type               theBlockSize)
@@ -258,7 +258,7 @@
 
 XalanOutputTranscoder*
 XalanTranscodingServices::makeNewTranscoder(
-            MemoryManagerType&      theManager,
+            MemoryManager&      theManager,
             const XalanDOMChar*     theEncodingName,
             eCode&                  theResult,
             size_type               theBlockSize)

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

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

Modified: xalan/c/trunk/src/xalanc/TestXPath/NodeNameTreeWalker.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/TestXPath/NodeNameTreeWalker.cpp?rev=699510&r1=699509&r2=699510&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/TestXPath/NodeNameTreeWalker.cpp (original)
+++ xalan/c/trunk/src/xalanc/TestXPath/NodeNameTreeWalker.cpp Fri Sep 26 14:34:43 2008
@@ -32,7 +32,7 @@
 
 
 
-NodeNameTreeWalker::NodeNameTreeWalker(MemoryManagerType& theManager) :
+NodeNameTreeWalker::NodeNameTreeWalker(MemoryManager& theManager) :
 	TreeWalker(),
 	m_nodeName(theManager),
 	m_matchingNodes(theManager)

Modified: xalan/c/trunk/src/xalanc/TestXPath/NodeNameTreeWalker.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/TestXPath/NodeNameTreeWalker.hpp?rev=699510&r1=699509&r2=699510&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/TestXPath/NodeNameTreeWalker.hpp (original)
+++ xalan/c/trunk/src/xalanc/TestXPath/NodeNameTreeWalker.hpp Fri Sep 26 14:34:43 2008
@@ -42,7 +42,7 @@
 
 	typedef XalanVector<const XalanNode*>		NodeVectorType;
 
-	NodeNameTreeWalker(MemoryManagerType& theManager);
+	NodeNameTreeWalker(MemoryManager& theManager);
 
 	virtual
 	~NodeNameTreeWalker();

Modified: xalan/c/trunk/src/xalanc/TestXPath/TestXPath.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/TestXPath/TestXPath.cpp?rev=699510&r1=699509&r2=699510&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/TestXPath/TestXPath.cpp (original)
+++ xalan/c/trunk/src/xalanc/TestXPath/TestXPath.cpp Fri Sep 26 14:34:43 2008
@@ -349,7 +349,7 @@
             const XalanDOMString&   theNodeName,
             const XalanDOMString&   theAttributeName,
             XalanDOMString&         theResult,
-            MemoryManagerType&      theMemoryManager)
+            MemoryManager&      theMemoryManager)
 {
     NodeNameTreeWalker  theTreeWalker(theMemoryManager);
 
@@ -382,7 +382,7 @@
             const XalanDOMString&   theXSLFileURL,
             XalanDOMString&         theContextNodeMatchPattern,
             XalanDOMString&         theXPathString,
-            MemoryManagerType&      theMemoryManager)
+            MemoryManager&      theMemoryManager)
 {
     bool                    fResult = false;
 
@@ -440,7 +440,7 @@
 {
     XalanNode*      theResult = 0;
 
-    MemoryManagerType&      theMemoryManager =
+    MemoryManager&      theMemoryManager =
         theExecutionContext.getMemoryManager();
 
     XPath* const    theXPath = theXPathFactory.create();
@@ -521,7 +521,7 @@
     XalanDocument* const    theXMLDocument = ParseXML(theLiaison,
                                                       theXMLFileURL);
 
-    MemoryManagerType&      theMemoryManager =
+    MemoryManager&      theMemoryManager =
         theExecutionContext.getMemoryManager();
 
     if (theXMLDocument != 0)
@@ -640,7 +640,7 @@
                 ParseXML(theLiaison,
                          theXMLFileURL);
 
-    MemoryManagerType&      theMemoryManager =
+    MemoryManager&      theMemoryManager =
         theExecutionContext.getMemoryManager();
 
     if (theXMLDocument != 0)
@@ -843,7 +843,7 @@
     assert(sizeof(theNumericTestInput) / sizeof(theNumericTestInput[0]) ==
             sizeof(theNumericTestExpectedOutput) / sizeof(theNumericTestExpectedOutput[0]));
 
-    MemoryManagerType&      theMemoryManager =
+    MemoryManager&      theMemoryManager =
         theExecutionContext.getMemoryManager();
 
     for(int i = 0; theNumericTestInput[i] != 0; i++)
@@ -989,7 +989,7 @@
 {
     assert(sizeof(theStringTestInput) == sizeof(theStringTestExpectedOutput));
 
-    MemoryManagerType&      theMemoryManager =
+    MemoryManager&      theMemoryManager =
         theExecutionContext.getMemoryManager();
 
     for(int i = 0; theStringTestInput[i] != 0; i++)
@@ -1141,7 +1141,7 @@
     assert(sizeof(theBooleanTestInput) / sizeof(theBooleanTestInput[0]) ==
                 sizeof(theBooleanTestExpectedOutput) / sizeof(theBooleanTestExpectedOutput[0]));
 
-    MemoryManagerType&      theMemoryManager =
+    MemoryManager&      theMemoryManager =
         theExecutionContext.getMemoryManager();
 
     for(int i = 0; theBooleanTestInput[i] != 0; i++)
@@ -1222,7 +1222,7 @@
             PrintWriter&            thePrintWriter,
             XPathExecutionContext&  theExecutionContext)
 {
-    MemoryManagerType& theMemoryManager = XalanMemMgrs::getDefaultXercesMemMgr();
+    MemoryManager& theMemoryManager = XalanMemMgrs::getDefaultXercesMemMgr();
 
     const XalanDOMString    theProtocol("file://", theMemoryManager);
 
@@ -1355,7 +1355,7 @@
     XalanTransformer::initialize();
 
     {
-        MemoryManagerType& theMemoryManager = XalanMemMgrs::getDefaultXercesMemMgr();
+        MemoryManager& theMemoryManager = XalanMemMgrs::getDefaultXercesMemMgr();
 
         XMLSupportInit                  theXMLSupportInit;
         XPathInit                       theXPathInit( theMemoryManager );

Modified: xalan/c/trunk/src/xalanc/TestXSLT/process.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/TestXSLT/process.cpp?rev=699510&r1=699509&r2=699510&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/TestXSLT/process.cpp (original)
+++ xalan/c/trunk/src/xalanc/TestXSLT/process.cpp Fri Sep 26 14:34:43 2008
@@ -554,7 +554,7 @@
 			const PrefixResolver&			prefixResolver,
 			const XalanDocument*&			theResultDocument)
 {
-    MemoryManagerType& theManager = XalanMemMgrs::getDefaultXercesMemMgr();
+    MemoryManager& theManager = XalanMemMgrs::getDefaultXercesMemMgr();
 
 	FormatterListener*	formatter = 0;
 
@@ -696,7 +696,7 @@
 
 
 XalanOutputStream*
-createOutputStream(MemoryManagerType& theManager , const CmdLineParams&		params)
+createOutputStream(MemoryManager& theManager , const CmdLineParams&		params)
 {
 	if (params.outFileName == 0)
 	{

Modified: xalan/c/trunk/src/xalanc/XMLSupport/FormatterToHTML.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XMLSupport/FormatterToHTML.cpp?rev=699510&r1=699509&r2=699510&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XMLSupport/FormatterToHTML.cpp (original)
+++ xalan/c/trunk/src/xalanc/XMLSupport/FormatterToHTML.cpp Fri Sep 26 14:34:43 2008
@@ -66,7 +66,7 @@
 			int						indent,
 			bool					escapeURLs,
 			bool					omitMetaTag,
-            MemoryManagerType&      theManager) :
+            MemoryManager&      theManager) :
 	FormatterToXML(
 			writer,
 			s_emptyString,
@@ -105,7 +105,7 @@
 
 FormatterToHTML*
 FormatterToHTML::create(
-            MemoryManagerType&      theManager,
+            MemoryManager&      theManager,
 			Writer&					writer,
 			const XalanDOMString&	encoding, 
 			const XalanDOMString&	mediaType,

Modified: xalan/c/trunk/src/xalanc/XMLSupport/FormatterToHTML.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XMLSupport/FormatterToHTML.hpp?rev=699510&r1=699509&r2=699510&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XMLSupport/FormatterToHTML.hpp (original)
+++ xalan/c/trunk/src/xalanc/XMLSupport/FormatterToHTML.hpp Fri Sep 26 14:34:43 2008
@@ -84,11 +84,11 @@
 			int						indent = eDefaultIndentAmount,
 			bool					escapeURLs = true,
 			bool					omitMetaTag = false,
-            MemoryManagerType&      theManager XALAN_DEFAULT_MEMMGR);
+            MemoryManager&      theManager XALAN_DEFAULT_MEMMGR);
 
     static FormatterToHTML*
     create(
-            MemoryManagerType&      theManager,
+            MemoryManager&      theManager,
 			Writer&					writer,
 			const XalanDOMString&	encoding, 
 			const XalanDOMString&	mediaType,

Modified: xalan/c/trunk/src/xalanc/XMLSupport/FormatterToText.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XMLSupport/FormatterToText.cpp?rev=699510&r1=699509&r2=699510&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XMLSupport/FormatterToText.cpp (original)
+++ xalan/c/trunk/src/xalanc/XMLSupport/FormatterToText.cpp Fri Sep 26 14:34:43 2008
@@ -33,7 +33,7 @@
 
 
 
-FormatterToText::FormatterToText(MemoryManagerType& theManager) :
+FormatterToText::FormatterToText(MemoryManager& theManager) :
 	FormatterListener(OUTPUT_METHOD_TEXT),
 	m_writer(0),
 	m_maxCharacter(XalanDOMChar(~0)),
@@ -52,7 +52,7 @@
 			Writer&		writer,
 			bool		normalizeLinefeed,
 			bool		handleIgnorableWhitespace,
-            MemoryManagerType& theManager) :
+            MemoryManager& theManager) :
 	FormatterListener(OUTPUT_METHOD_TEXT),
 	m_writer(&writer),
 	m_maxCharacter(XalanDOMChar(~0)),
@@ -73,7 +73,7 @@
 			const XalanDOMString&	encoding,
 			bool					normalizeLinefeed,
 			bool					handleIgnorableWhitespace,
-            MemoryManagerType&      theManager ) :
+            MemoryManager&      theManager ) :
 	FormatterListener(OUTPUT_METHOD_TEXT),
 	m_writer(&writer),
 	m_maxCharacter(0),
@@ -98,7 +98,7 @@
 
 FormatterToText*
 FormatterToText::create(
-            MemoryManagerType&      theManager,
+            MemoryManager&      theManager,
 			Writer&					writer,
 			const XalanDOMString&	encoding,
 			bool					normalizeLinefeed,

Modified: xalan/c/trunk/src/xalanc/XMLSupport/FormatterToText.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XMLSupport/FormatterToText.hpp?rev=699510&r1=699509&r2=699510&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XMLSupport/FormatterToText.hpp (original)
+++ xalan/c/trunk/src/xalanc/XMLSupport/FormatterToText.hpp Fri Sep 26 14:34:43 2008
@@ -53,7 +53,7 @@
 	/**
 	 * FormatterToText instance constructor.
 	 */
-	FormatterToText(MemoryManagerType& theManager XALAN_DEFAULT_CONSTRUCTOR_MEMMGR);
+	FormatterToText(MemoryManager& theManager XALAN_DEFAULT_CONSTRUCTOR_MEMMGR);
 
 	/**
 	 * FormatterToText instance constructor.
@@ -66,7 +66,7 @@
 			Writer&		        writer,
 			bool		        normalizeLinefeed = true,
 			bool		        handleIgnorableWhitespace = true,
-            MemoryManagerType&  theManager XALAN_DEFAULT_MEMMGR);
+            MemoryManager&  theManager XALAN_DEFAULT_MEMMGR);
 
 	/**
 	 * FormatterToText instance constructor.
@@ -81,11 +81,11 @@
 			const XalanDOMString&	encoding,
 			bool					normalizeLinefeed = true,
 			bool					handleIgnorableWhitespace = true,
-            MemoryManagerType&      theManager XALAN_DEFAULT_MEMMGR);
+            MemoryManager&      theManager XALAN_DEFAULT_MEMMGR);
 
 	static FormatterToText*
     create(
-            MemoryManagerType&      theManager,
+            MemoryManager&      theManager,
 			Writer&					writer,
 			const XalanDOMString&	encoding,
 			bool					normalizeLinefeed = true,
@@ -94,7 +94,7 @@
 	virtual
 	~FormatterToText();
 
-    MemoryManagerType&
+    MemoryManager&
     getMemoryManager()
     {
         return m_encoding.getMemoryManager();

Modified: xalan/c/trunk/src/xalanc/XMLSupport/FormatterToXML.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XMLSupport/FormatterToXML.cpp?rev=699510&r1=699509&r2=699510&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XMLSupport/FormatterToXML.cpp (original)
+++ xalan/c/trunk/src/xalanc/XMLSupport/FormatterToXML.cpp Fri Sep 26 14:34:43 2008
@@ -70,7 +70,7 @@
             const XalanDOMString&   standalone,
             eFormat                 format,
             bool                    fBufferData,
-            MemoryManagerType&      theManager) :
+            MemoryManager&      theManager) :
     FormatterListener(format),
     m_writer(&writer),
     m_stream(m_writer->getStream()),
@@ -325,7 +325,7 @@
 
 FormatterToXML*
 FormatterToXML::create(
-                       MemoryManagerType&      theManager,
+                       MemoryManager&      theManager,
                        Writer&                  writer,
                        const XalanDOMString&    version,
                        bool                     doIndent ,
@@ -797,7 +797,7 @@
 void
 FormatterToXML::throwInvalidUTF16SurrogateException(
             XalanDOMChar        ch,
-            MemoryManagerType&  theManager)
+            MemoryManager&  theManager)
 {
     XalanDOMString  chStr(theManager);
 
@@ -816,7 +816,7 @@
 void
 FormatterToXML::throwInvalidCharacterException(
             XalanUnicodeChar    ch,
-            MemoryManagerType&  theManager)
+            MemoryManager&  theManager)
 {
     XalanDOMString  theMessage(theManager);
     XalanDOMString  theBuffer(theManager);  
@@ -835,7 +835,7 @@
 FormatterToXML::throwInvalidUTF16SurrogateException(
             XalanDOMChar        ch,
             XalanDOMChar        next,
-            MemoryManagerType&  theManager)
+            MemoryManager&  theManager)
 {
 
     XalanDOMString  chStr1(theManager); 

Modified: xalan/c/trunk/src/xalanc/XMLSupport/FormatterToXML.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XMLSupport/FormatterToXML.hpp?rev=699510&r1=699509&r2=699510&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XMLSupport/FormatterToXML.hpp (original)
+++ xalan/c/trunk/src/xalanc/XMLSupport/FormatterToXML.hpp Fri Sep 26 14:34:43 2008
@@ -99,11 +99,11 @@
             const XalanDOMString&   standalone = XalanDOMString(XalanMemMgrs::getDummyMemMgr()),
             eFormat                 format = OUTPUT_METHOD_XML,
             bool                    fBufferData = true,
-            MemoryManagerType&      theManager XALAN_DEFAULT_MEMMGR);
+            MemoryManager&      theManager XALAN_DEFAULT_MEMMGR);
     
     static FormatterToXML*
     create(
-            MemoryManagerType&      theManager,
+            MemoryManager&      theManager,
             Writer&                 writer,
             const XalanDOMString&   version = XalanDOMString(XalanMemMgrs::getDummyMemMgr()),
             bool                    doIndent = false,
@@ -120,7 +120,7 @@
     virtual
     ~FormatterToXML();
 
-    MemoryManagerType&
+    MemoryManager&
     getMemoryManager()
     {
         return m_stringBuffer.getMemoryManager();
@@ -555,7 +555,7 @@
     static void
     throwInvalidUTF16SurrogateException(
             XalanDOMChar        ch,
-            MemoryManagerType&  theManager);
+            MemoryManager&  theManager);
 
     /**
      * Throw an exception when an invalid
@@ -568,7 +568,7 @@
     throwInvalidUTF16SurrogateException(
             XalanDOMChar        ch,
             XalanDOMChar        next,
-            MemoryManagerType& theManager);
+            MemoryManager& theManager);
 
 
 	/**
@@ -580,7 +580,7 @@
     static void
     throwInvalidCharacterException( 
             XalanUnicodeChar    ch,
-            MemoryManagerType&  theManager);
+            MemoryManager&  theManager);
 
     static bool
     isUTF16Surrogate(XalanDOMChar   ch)

Modified: xalan/c/trunk/src/xalanc/XMLSupport/FormatterTreeWalker.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XMLSupport/FormatterTreeWalker.hpp?rev=699510&r1=699509&r2=699510&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XMLSupport/FormatterTreeWalker.hpp (original)
+++ xalan/c/trunk/src/xalanc/XMLSupport/FormatterTreeWalker.hpp Fri Sep 26 14:34:43 2008
@@ -48,7 +48,7 @@
 	 *                          (toXMLString, digest, ...)
 	 */
 	FormatterTreeWalker(FormatterListener&	formatterListener,
-                        MemoryManagerType& theManager XALAN_DEFAULT_MEMMGR);
+                        MemoryManager& theManager XALAN_DEFAULT_MEMMGR);
 
 	virtual
 	~FormatterTreeWalker();
@@ -71,7 +71,7 @@
 
 	FormatterListener&	m_formatterListener;
 
-    MemoryManagerType&  m_memoryManager;
+    MemoryManager&  m_memoryManager;
 };
 
 

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

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

Modified: xalan/c/trunk/src/xalanc/XMLSupport/XalanFormatterWriter.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XMLSupport/XalanFormatterWriter.hpp?rev=699510&r1=699509&r2=699510&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XMLSupport/XalanFormatterWriter.hpp (original)
+++ xalan/c/trunk/src/xalanc/XMLSupport/XalanFormatterWriter.hpp Fri Sep 26 14:34:43 2008
@@ -182,7 +182,7 @@
         assert(m_newlineString != 0);
     }
 
-    MemoryManagerType&
+    MemoryManager&
     getMemoryManager()
     {
         return m_memoryManager;
@@ -284,7 +284,7 @@
     throwInvalidUTF16SurrogateException(
 			    XalanDOMChar	    ch,
 			    XalanDOMChar	    next,
-                MemoryManagerType&  theManager)
+                MemoryManager&  theManager)
     {
 
 	    XalanDOMString  chStr(theManager); 

Modified: xalan/c/trunk/src/xalanc/XMLSupport/XalanXMLSerializerBase.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XMLSupport/XalanXMLSerializerBase.hpp?rev=699510&r1=699509&r2=699510&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XMLSupport/XalanXMLSerializerBase.hpp (original)
+++ xalan/c/trunk/src/xalanc/XMLSupport/XalanXMLSerializerBase.hpp Fri Sep 26 14:34:43 2008
@@ -98,7 +98,7 @@
     virtual
     ~XalanXMLSerializerBase();
 
-    MemoryManagerType&
+    MemoryManager&
     getMemoryManager()
     {
         return m_elemStack.getMemoryManager();

Modified: xalan/c/trunk/src/xalanc/XPath/ElementPrefixResolverProxy.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/ElementPrefixResolverProxy.cpp?rev=699510&r1=699509&r2=699510&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/ElementPrefixResolverProxy.cpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/ElementPrefixResolverProxy.cpp Fri Sep 26 14:34:43 2008
@@ -45,7 +45,7 @@
 			const XalanElement*		namespaceContext,
 			const XPathEnvSupport&	envSupport,
 			const DOMSupport& 		/* domSupport */,
-            MemoryManagerType&      theManager) :
+            MemoryManager&      theManager) :
 	m_namespaceContext(namespaceContext),
 	m_envSupport(&envSupport),
 	m_uri(theManager)
@@ -56,7 +56,7 @@
 
 ElementPrefixResolverProxy::ElementPrefixResolverProxy(
 			const XalanElement*		namespaceContext,
-            MemoryManagerType&      theManager,
+            MemoryManager&      theManager,
 			const XPathEnvSupport*	envSupport) :
 	m_namespaceContext(namespaceContext),
 	m_envSupport(envSupport),

Modified: xalan/c/trunk/src/xalanc/XPath/ElementPrefixResolverProxy.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/ElementPrefixResolverProxy.hpp?rev=699510&r1=699509&r2=699510&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/ElementPrefixResolverProxy.hpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/ElementPrefixResolverProxy.hpp Fri Sep 26 14:34:43 2008
@@ -61,7 +61,7 @@
 			const XalanElement*		namespaceContext,
 			const XPathEnvSupport&	envSupport,
 			const DOMSupport& 		domSupport,
-            MemoryManagerType&      theManager XALAN_DEFAULT_MEMMGR);
+            MemoryManager&      theManager XALAN_DEFAULT_MEMMGR);
 
 	/**
 	 * Construct an instance of an element prefix resolver proxy.
@@ -72,7 +72,7 @@
 	 */
 	ElementPrefixResolverProxy(
 			const XalanElement*		namespaceContext,
-            MemoryManagerType&      theManager XALAN_DEFAULT_MEMMGR,
+            MemoryManager&      theManager XALAN_DEFAULT_MEMMGR,
 			const XPathEnvSupport*	envSupport = 0);
 
 	virtual

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Modified: xalan/c/trunk/src/xalanc/XPath/MutableNodeRefList.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/MutableNodeRefList.hpp?rev=699510&r1=699509&r2=699510&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/MutableNodeRefList.hpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/MutableNodeRefList.hpp Fri Sep 26 14:34:43 2008
@@ -51,17 +51,17 @@
 	 * Construct an empty mutable node list.
 	 */
 	explicit
-	MutableNodeRefList(MemoryManagerType& theManager);
+	MutableNodeRefList(MemoryManager& theManager);
 
     static MutableNodeRefList*
-    create(MemoryManagerType& theManager);
+    create(MemoryManager& theManager);
 	/**
 	 * Construct a mutable node list from another list.
 	 * 
 	 * @param theSource source list
 	 */
 	MutableNodeRefList(const MutableNodeRefList&	theSource,
-                        MemoryManagerType& theManager);
+                        MemoryManager& theManager);
 
 	/**
 	 * Construct a mutable node list from another list.
@@ -70,7 +70,7 @@
 	 */
 	explicit
 	MutableNodeRefList(const NodeRefListBase&	theSource,
-                        MemoryManagerType& theManager);
+                        MemoryManager& theManager);
 
 	virtual
 	~MutableNodeRefList();

Modified: xalan/c/trunk/src/xalanc/XPath/NameSpace.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/NameSpace.hpp?rev=699510&r1=699509&r2=699510&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/NameSpace.hpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/NameSpace.hpp Fri Sep 26 14:34:43 2008
@@ -42,7 +42,7 @@
 public:
 
 	explicit
-	NameSpace(MemoryManagerType&  theManager) :
+	NameSpace(MemoryManager&  theManager) :
 		m_prefix(theManager),
 		m_uri(theManager)
 	{
@@ -58,7 +58,7 @@
 	NameSpace(
 			const XalanDOMString&	prefix,
 			const XalanDOMString&	uri,
-            MemoryManagerType&      theManager) :
+            MemoryManager&      theManager) :
 		m_prefix(prefix, theManager),
 		m_uri(uri, theManager)
 	{
@@ -68,7 +68,7 @@
 	create(
 			const XalanDOMString&	prefix,
 			const XalanDOMString&	uri,
-            MemoryManagerType&      theManager)
+            MemoryManager&      theManager)
 	{
 		typedef NameSpace ThisType;
 		
@@ -83,7 +83,7 @@
 		return theResult;
 	}
     NameSpace( const NameSpace&     other,
-        MemoryManagerType&      theManager) :
+        MemoryManager&      theManager) :
 		m_prefix(other.m_prefix, theManager),
 		m_uri(other.m_uri, theManager)        
     {

Modified: xalan/c/trunk/src/xalanc/XPath/NodeRefList.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/NodeRefList.cpp?rev=699510&r1=699509&r2=699510&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/NodeRefList.cpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/NodeRefList.cpp Fri Sep 26 14:34:43 2008
@@ -33,7 +33,7 @@
 
 
 
-NodeRefList::NodeRefList(MemoryManagerType& theManager) :
+NodeRefList::NodeRefList(MemoryManager& theManager) :
 	NodeRefListBase(),
 	m_nodeList(theManager)
 {
@@ -42,7 +42,7 @@
 
 
 NodeRefList::NodeRefList(const NodeRefList&		theSource,
-                         MemoryManagerType& theManager) :
+                         MemoryManager& theManager) :
 	NodeRefListBase(theSource),
 	m_nodeList(theSource.m_nodeList, theManager)
 {
@@ -51,7 +51,7 @@
 
 
 NodeRefList::NodeRefList(const NodeRefListBase&		theSource,
-                         MemoryManagerType& theManager) :
+                         MemoryManager& theManager) :
 	NodeRefListBase(theSource),
 	m_nodeList(theManager)
 {
@@ -153,7 +153,7 @@
 
 #if !defined(NDEBUG)
 bool
-NodeRefList::checkForDuplicates(MemoryManagerType& theManager) const
+NodeRefList::checkForDuplicates(MemoryManager& theManager) const
 {
 	typedef XalanSet<const XalanNode*>	NodeSetType;
 

Modified: xalan/c/trunk/src/xalanc/XPath/NodeRefList.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/NodeRefList.hpp?rev=699510&r1=699509&r2=699510&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/NodeRefList.hpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/NodeRefList.hpp Fri Sep 26 14:34:43 2008
@@ -101,7 +101,7 @@
 
 #if !defined(NDEBUG)
 	bool
-	checkForDuplicates(MemoryManagerType& theManager) const;
+	checkForDuplicates(MemoryManager& theManager) const;
 #endif
 
 	typedef XalanVector<XalanNode*>			NodeListVectorType;

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

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

Modified: xalan/c/trunk/src/xalanc/XPath/XNodeSetNodeProxy.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/XNodeSetNodeProxy.hpp?rev=699510&r1=699509&r2=699510&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/XNodeSetNodeProxy.hpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/XNodeSetNodeProxy.hpp Fri Sep 26 14:34:43 2008
@@ -48,14 +48,14 @@
 	/**
 	 * Create an XNodeSetNodeProxy
 	 */
-	XNodeSetNodeProxy(MemoryManagerType& theManager, XalanNode*	theNode);
+	XNodeSetNodeProxy(MemoryManager& theManager, XalanNode*	theNode);
 
 	/**
 	 * Create an XNodeSetNodeProxy from another.
 	 *
 	 * @param source    object to copy
 	 */
-	XNodeSetNodeProxy(const XNodeSetNodeProxy&	source, MemoryManagerType& theManager);
+	XNodeSetNodeProxy(const XNodeSetNodeProxy&	source, MemoryManager& theManager);
 
 	virtual
 	~XNodeSetNodeProxy();

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

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

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

Modified: xalan/c/trunk/src/xalanc/XPath/XObjectFactoryDefault.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/XObjectFactoryDefault.hpp?rev=699510&r1=699509&r2=699510&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/XObjectFactoryDefault.hpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/XObjectFactoryDefault.hpp Fri Sep 26 14:34:43 2008
@@ -83,7 +83,7 @@
 	 */
 	explicit
 	XObjectFactoryDefault(
-            MemoryManagerType& theManager XALAN_DEFAULT_MEMMGR,
+            MemoryManager& theManager XALAN_DEFAULT_MEMMGR,
 			size_type	theXStringBlockSize = eDefaultXStringBlockSize,
 			size_type	theXNumberBlockSize = eDefaultXNumberBlockSize,
 			size_type	theXNodeSetBlockSize = eDefaultXNodeSetBlockSize,
@@ -91,7 +91,7 @@
 
     static XObjectFactoryDefault*
     create(
-            MemoryManagerType& theManager,
+            MemoryManager& theManager,
 			size_type	theXStringBlockSize = eDefaultXStringBlockSize,
 			size_type	theXNumberBlockSize = eDefaultXNumberBlockSize,
 			size_type	theXNodeSetBlockSize = eDefaultXNodeSetBlockSize,
@@ -101,7 +101,7 @@
 	virtual
 	~XObjectFactoryDefault();
 
-    MemoryManagerType&
+    MemoryManager&
     getMemoryManager()
     {
         return m_xobjects.getMemoryManager();



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