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/10/02 00:24:19 UTC
svn commit: r700953 - in /xalan/c/trunk/src/xalanc:
Include/XalanMemoryManagement.hpp PlatformSupport/ExecutionContext.hpp
XPath/XObject.cpp XPath/XStringBase.cpp
Author: dbertoni
Date: Wed Oct 1 15:24:19 2008
New Revision: 700953
URL: http://svn.apache.org/viewvc?rev=700953&view=rev
Log:
Fixes for Xerces-C 2.8 suppport.
Modified:
xalan/c/trunk/src/xalanc/Include/XalanMemoryManagement.hpp
xalan/c/trunk/src/xalanc/PlatformSupport/ExecutionContext.hpp
xalan/c/trunk/src/xalanc/XPath/XObject.cpp
xalan/c/trunk/src/xalanc/XPath/XStringBase.cpp
Modified: xalan/c/trunk/src/xalanc/Include/XalanMemoryManagement.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/Include/XalanMemoryManagement.hpp?rev=700953&r1=700952&r2=700953&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/Include/XalanMemoryManagement.hpp (original)
+++ xalan/c/trunk/src/xalanc/Include/XalanMemoryManagement.hpp Wed Oct 1 15:24:19 2008
@@ -24,6 +24,7 @@
+#include <cassert>
#include <cstddef>
#include <new>
@@ -71,6 +72,18 @@
virtual MemoryManager*
getExceptionMemoryManager() = 0;
+ static MemoryManager&
+ getExceptionMemoryManager(MemoryManager& theMemoryManager)
+ {
+#if XERCES_VERSION_MAJOR < 3
+ return theMemoryManager;
+#else
+ assert(theMemoryManager.getExceptionMemoryManager() != 0);
+
+ return *theMemoryManager.getExceptionMemoryManager();
+#endif
+ }
+
protected:
XalanMemoryManager(const XalanMemoryManager& theSource);
Modified: xalan/c/trunk/src/xalanc/PlatformSupport/ExecutionContext.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/ExecutionContext.hpp?rev=700953&r1=700952&r2=700953&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/PlatformSupport/ExecutionContext.hpp (original)
+++ xalan/c/trunk/src/xalanc/PlatformSupport/ExecutionContext.hpp Wed Oct 1 15:24:19 2008
@@ -105,7 +105,7 @@
MemoryManager&
getExceptionMemoryManager() const
{
- return *m_memoryManager.getExceptionMemoryManager();
+ return XalanMemoryManager::getExceptionMemoryManager(m_memoryManager);
}
protected:
Modified: xalan/c/trunk/src/xalanc/XPath/XObject.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/XObject.cpp?rev=700953&r1=700952&r2=700953&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/XObject.cpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/XObject.cpp Wed Oct 1 15:24:19 2008
@@ -1302,14 +1302,13 @@
{
assert(m_memoryManager != 0);
- MemoryManager* const theMemoryManager =
- m_memoryManager->getExceptionMemoryManager();
- assert(theMemoryManager != 0);
+ MemoryManager& theMemoryManager =
+ XalanMemoryManager::getExceptionMemoryManager(*m_memoryManager);
- XalanDOMString theBuffer(*theMemoryManager);
+ XalanDOMString theBuffer(theMemoryManager);
throw XObjectInvalidConversionException(
- *theMemoryManager,
+ theMemoryManager,
getTypeString(),
theTargetType,
theBuffer);
Modified: xalan/c/trunk/src/xalanc/XPath/XStringBase.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/XStringBase.cpp?rev=700953&r1=700952&r2=700953&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/XStringBase.cpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/XStringBase.cpp Wed Oct 1 15:24:19 2008
@@ -142,10 +142,13 @@
const XalanDOMString&
XStringBase::str() const
{
- XalanDOMString theBuffer(*getMemoryManager().getExceptionMemoryManager());
+ MemoryManager& theMemoryManager =
+ XalanMemoryManager::getExceptionMemoryManager(getMemoryManager());
+
+ XalanDOMString theBuffer(theMemoryManager);
throw XObjectInvalidConversionException(
- theBuffer.getMemoryManager(),
+ theMemoryManager,
getTypeString(),
s_numberString,
theBuffer);
---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org