From: scantor Date: Fri, 10 Feb 2012 20:19:22 +0000 (+0000) Subject: Fix legacy XMLString release call X-Git-Tag: 1.5.1~32 X-Git-Url: http://www.project-moonshot.org/gitweb/?p=shibboleth%2Fxmltooling.git;a=commitdiff_plain;h=20b86e88841a3a2c78f16e7f80f94a7c78b71bb9 Fix legacy XMLString release call git-svn-id: https://svn.shibboleth.net/cpp-xmltooling/branches/REL_1@961 de75baf8-a10c-0410-a50a-987c0e22f00f --- diff --git a/xmltooling/AbstractAttributeExtensibleXMLObject.cpp b/xmltooling/AbstractAttributeExtensibleXMLObject.cpp index 1f819f6..a89d8a1 100644 --- a/xmltooling/AbstractAttributeExtensibleXMLObject.cpp +++ b/xmltooling/AbstractAttributeExtensibleXMLObject.cpp @@ -112,13 +112,19 @@ AbstractAttributeExtensibleXMLObject::AbstractAttributeExtensibleXMLObject(const 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::value_type::second, boost::ref(_1)), - XMLPlatformUtils::fgMemoryManager + &lambda::bind(&map::value_type::second, boost::ref(_1)) +#ifndef XMLTOOLING_XERCESC_HAS_XMLBYTE_RELEASE + ,XMLPlatformUtils::fgMemoryManager +#endif ) ); }