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:
6be00e0
)
Fix legacy XMLString release call
author
Scott Cantor
<cantor.2@osu.edu>
Fri, 10 Feb 2012 20:29:36 +0000
(20:29 +0000)
committer
Scott Cantor
<cantor.2@osu.edu>
Fri, 10 Feb 2012 20:29:36 +0000
(20:29 +0000)
xmltooling/AbstractComplexElement.cpp
patch
|
blob
|
history
diff --git
a/xmltooling/AbstractComplexElement.cpp
b/xmltooling/AbstractComplexElement.cpp
index
9c7a276
..
a8e68ef
100644
(file)
--- a/
xmltooling/AbstractComplexElement.cpp
+++ b/
xmltooling/AbstractComplexElement.cpp
@@
-54,10
+54,21
@@
AbstractComplexElement::AbstractComplexElement(const AbstractComplexElement& src
}
AbstractComplexElement::~AbstractComplexElement() {
}
AbstractComplexElement::~AbstractComplexElement() {
+#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_children.begin(), m_children.end(), cleanup<XMLObject>());
for_each(m_children.begin(), m_children.end(), cleanup<XMLObject>());
- for_each(m_text.begin(), m_text.end(), lambda::bind(release, &_1, XMLPlatformUtils::fgMemoryManager));
+ for_each(m_text.begin(), m_text.end(),
+ lambda::bind(
+ release, &_1
+#ifndef XMLTOOLING_XERCESC_HAS_XMLBYTE_RELEASE
+ ,XMLPlatformUtils::fgMemoryManager
+#endif
+ )
+ );
}
bool AbstractComplexElement::hasChildren() const
}
bool AbstractComplexElement::hasChildren() const