projects
/
shibboleth
/
cpp-xmltooling.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
4fea3ad
)
Fix legacy XMLString release call
author
Scott Cantor
<cantor.2@osu.edu>
Fri, 10 Feb 2012 20:19:22 +0000
(20:19 +0000)
committer
Scott Cantor
<cantor.2@osu.edu>
Fri, 10 Feb 2012 20:19:22 +0000
(20:19 +0000)
xmltooling/AbstractAttributeExtensibleXMLObject.cpp
patch
|
blob
|
history
diff --git
a/xmltooling/AbstractAttributeExtensibleXMLObject.cpp
b/xmltooling/AbstractAttributeExtensibleXMLObject.cpp
index
1f819f6
..
a89d8a1
100644
(file)
--- a/
xmltooling/AbstractAttributeExtensibleXMLObject.cpp
+++ b/
xmltooling/AbstractAttributeExtensibleXMLObject.cpp
@@
-112,13
+112,19
@@
AbstractAttributeExtensibleXMLObject::AbstractAttributeExtensibleXMLObject(const
AbstractAttributeExtensibleXMLObject::~AbstractAttributeExtensibleXMLObject()
{
AbstractAttributeExtensibleXMLObject::~AbstractAttributeExtensibleXMLObject()
{
+#ifdef XMLTOOLING_XERCESC_HAS_XMLBYTE_RELEASE
+ static void (*release)(XMLCh**) = &XMLString::release;
+#else
static void (*release)(XMLCh**,MemoryManager*) = &XMLString::release;
static void (*release)(XMLCh**,MemoryManager*) = &XMLString::release;
+#endif
for_each(
m_attributeMap.begin(), m_attributeMap.end(),
lambda::bind(
release,
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
)
);
}
)
);
}