[cpp-xmltooling COMMIT] /branches/REL_1/xmltooling/AbstractAttributeExtensibleXMLObject.cpp

noreply at shibboleth.net noreply at shibboleth.net
Fri Feb 10 20:19:22 GMT 2012


Author: scantor
Date: Fri Feb 10 20:19:22 2012
New Revision: 961

URL: http://svn.shibboleth.net/view/cpp-xmltooling?rev=961&view=rev
Log:
Fix legacy XMLString release call

Modified:
    branches/REL_1/xmltooling/AbstractAttributeExtensibleXMLObject.cpp

Modified: branches/REL_1/xmltooling/AbstractAttributeExtensibleXMLObject.cpp
URL: http://svn.shibboleth.net/view/cpp-xmltooling/branches/REL_1/xmltooling/AbstractAttributeExtensibleXMLObject.cpp?rev=961&r1=960&r2=961&view=diff
==============================================================================
--- branches/REL_1/xmltooling/AbstractAttributeExtensibleXMLObject.cpp (original)
+++ branches/REL_1/xmltooling/AbstractAttributeExtensibleXMLObject.cpp Fri Feb 10 20:19:22 2012
@@ -112,13 +112,19 @@
 
 AbstractAttributeExtensibleXMLObject::~AbstractAttributeExtensibleXMLObject()
 {
+#ifdef XMLTOOLING_XERCESC_HAS_XMLBYTE_RELEASE
+    static void (*release)(XMLCh**) = &XMLString::release;
+#else
     static void (*release)(XMLCh**,MemoryManager*) = &XMLString::release;
+#endif
     for_each(
         m_attributeMap.begin(), m_attributeMap.end(),
         lambda::bind(
             release,
-            &lambda::bind(&map<xmltooling::QName,XMLCh*>::value_type::second, boost::ref(_1)),
-            XMLPlatformUtils::fgMemoryManager
+            &lambda::bind(&map<xmltooling::QName,XMLCh*>::value_type::second, boost::ref(_1))
+#ifndef XMLTOOLING_XERCESC_HAS_XMLBYTE_RELEASE
+            ,XMLPlatformUtils::fgMemoryManager
+#endif
             )
         );
 }



More information about the commits mailing list