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/04/25 20:01:21 UTC
svn commit: r651671 - in /xalan/c/trunk: samples/SimpleTransform/
src/xalanc/Harness/ src/xalanc/PlatformSupport/ src/xalanc/XalanExe/
Author: dbertoni
Date: Fri Apr 25 11:01:19 2008
New Revision: 651671
URL: http://svn.apache.org/viewvc?rev=651671&view=rev
Log:
Changes for compatibility with the updated Xerces-C MemoryManager class.
Modified:
xalan/c/trunk/samples/SimpleTransform/XalanMemoryManagerImpl.hpp
xalan/c/trunk/src/xalanc/Harness/XalanDiagnosticMemoryManager.cpp
xalan/c/trunk/src/xalanc/Harness/XalanDiagnosticMemoryManager.hpp
xalan/c/trunk/src/xalanc/PlatformSupport/XalanMemoryManagement.cpp
xalan/c/trunk/src/xalanc/PlatformSupport/XalanMemoryManagerDefault.cpp
xalan/c/trunk/src/xalanc/PlatformSupport/XalanMemoryManagerDefault.hpp
xalan/c/trunk/src/xalanc/XalanExe/XalanExe.cpp
Modified: xalan/c/trunk/samples/SimpleTransform/XalanMemoryManagerImpl.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/samples/SimpleTransform/XalanMemoryManagerImpl.hpp?rev=651671&r1=651670&r2=651671&view=diff
==============================================================================
--- xalan/c/trunk/samples/SimpleTransform/XalanMemoryManagerImpl.hpp (original)
+++ xalan/c/trunk/samples/SimpleTransform/XalanMemoryManagerImpl.hpp Fri Apr 25 11:01:19 2008
@@ -92,7 +92,13 @@
}
}
- virtual
+ MemoryManager*
+ getExceptionMemoryManager()
+ {
+ return this;
+ }
+
+ virtual
~XalanMemoryManagerImpl()
{
if( 0 == HeapDestroy(m_heapHandle) )
Modified: xalan/c/trunk/src/xalanc/Harness/XalanDiagnosticMemoryManager.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/Harness/XalanDiagnosticMemoryManager.cpp?rev=651671&r1=651670&r2=651671&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/Harness/XalanDiagnosticMemoryManager.cpp (original)
+++ xalan/c/trunk/src/xalanc/Harness/XalanDiagnosticMemoryManager.cpp Fri Apr 25 11:01:19 2008
@@ -159,6 +159,14 @@
+MemoryManager*
+XalanDiagnosticMemoryManager::getExceptionMemoryManager()
+{
+ return &m_memoryManager;
+}
+
+
+
void
XalanDiagnosticMemoryManager::dumpStatistics(
StreamType* theStream,
Modified: xalan/c/trunk/src/xalanc/Harness/XalanDiagnosticMemoryManager.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/Harness/XalanDiagnosticMemoryManager.hpp?rev=651671&r1=651670&r2=651671&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/Harness/XalanDiagnosticMemoryManager.hpp (original)
+++ xalan/c/trunk/src/xalanc/Harness/XalanDiagnosticMemoryManager.hpp Fri Apr 25 11:01:19 2008
@@ -98,6 +98,9 @@
virtual void
deallocate(void* pointer);
+ virtual MemoryManager*
+ getExceptionMemoryManager();
+
bool
getAssertErrors() const
{
Modified: xalan/c/trunk/src/xalanc/PlatformSupport/XalanMemoryManagement.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/XalanMemoryManagement.cpp?rev=651671&r1=651670&r2=651671&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/PlatformSupport/XalanMemoryManagement.cpp (original)
+++ xalan/c/trunk/src/xalanc/PlatformSupport/XalanMemoryManagement.cpp Fri Apr 25 11:01:19 2008
@@ -42,7 +42,8 @@
return 0;
}
- virtual void
+
+ virtual void
deallocate( void* /* pDataPointer */ )
{
XALAN_USING_STD(bad_alloc)
@@ -50,8 +51,12 @@
throw bad_alloc();
}
-
-
+
+ MemoryManager*
+ getExceptionMemoryManager()
+ {
+ return this;
+ }
};
Modified: xalan/c/trunk/src/xalanc/PlatformSupport/XalanMemoryManagerDefault.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/XalanMemoryManagerDefault.cpp?rev=651671&r1=651670&r2=651671&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/PlatformSupport/XalanMemoryManagerDefault.cpp (original)
+++ xalan/c/trunk/src/xalanc/PlatformSupport/XalanMemoryManagerDefault.cpp Fri Apr 25 11:01:19 2008
@@ -76,4 +76,12 @@
+MemoryManager*
+XalanMemoryManagerDefault::getExceptionMemoryManager()
+{
+ return this;
+}
+
+
+
XALAN_CPP_NAMESPACE_END
Modified: xalan/c/trunk/src/xalanc/PlatformSupport/XalanMemoryManagerDefault.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/XalanMemoryManagerDefault.hpp?rev=651671&r1=651670&r2=651671&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/PlatformSupport/XalanMemoryManagerDefault.hpp (original)
+++ xalan/c/trunk/src/xalanc/PlatformSupport/XalanMemoryManagerDefault.hpp Fri Apr 25 11:01:19 2008
@@ -54,6 +54,9 @@
virtual void
deallocate(void* pointer);
+ virtual MemoryManager*
+ getExceptionMemoryManager();
+
private:
// These are not implemented.
Modified: xalan/c/trunk/src/xalanc/XalanExe/XalanExe.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XalanExe/XalanExe.cpp?rev=651671&r1=651670&r2=651671&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XalanExe/XalanExe.cpp (original)
+++ xalan/c/trunk/src/xalanc/XalanExe/XalanExe.cpp Fri Apr 25 11:01:19 2008
@@ -879,6 +879,12 @@
HeapFree(m_handle, HEAP_NO_SERIALIZE, pointer);
}
+ MemoryManager*
+ getExceptionMemoryManager()
+ {
+ return this;
+ }
+
protected:
private:
---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org