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:
e93ce2c
)
Fix some gcc compiler issues
author
Scott Cantor
<cantor.2@osu.edu>
Wed, 14 Dec 2011 08:49:07 +0000
(08:49 +0000)
committer
Scott Cantor
<cantor.2@osu.edu>
Wed, 14 Dec 2011 08:49:07 +0000
(08:49 +0000)
xmltooling/AbstractComplexElement.cpp
patch
|
blob
|
history
xmltooling/util/ParserPool.cpp
patch
|
blob
|
history
xmltooling/util/ParserPool.h
patch
|
blob
|
history
xmltooling/util/XMLHelper.cpp
patch
|
blob
|
history
diff --git
a/xmltooling/AbstractComplexElement.cpp
b/xmltooling/AbstractComplexElement.cpp
index
fa1e6ef
..
9c7a276
100644
(file)
--- a/
xmltooling/AbstractComplexElement.cpp
+++ b/
xmltooling/AbstractComplexElement.cpp
@@
-64,7
+64,7
@@
bool AbstractComplexElement::hasChildren() const
{
if (m_children.empty())
return false;
{
if (m_children.empty())
return false;
- return (find_if(m_children.begin(), m_children.end(), (_1 !=
nullptr
)) != m_children.end());
+ return (find_if(m_children.begin(), m_children.end(), (_1 !=
((XMLObject*)nullptr)
)) != m_children.end());
}
const list<XMLObject*>& AbstractComplexElement::getOrderedChildren() const
}
const list<XMLObject*>& AbstractComplexElement::getOrderedChildren() const
diff --git
a/xmltooling/util/ParserPool.cpp
b/xmltooling/util/ParserPool.cpp
index
6a4700d
..
5e44c28
100644
(file)
--- a/
xmltooling/util/ParserPool.cpp
+++ b/
xmltooling/util/ParserPool.cpp
@@
-325,6
+325,7
@@
DOMInputSource* ParserPool::resolveEntity(
#endif
if (!systemId)
return nullptr;
#endif
if (!systemId)
return nullptr;
+ xstring sysId(systemId);
Category& log=Category::getInstance(XMLTOOLING_LOGCAT".ParserPool");
if (log.isDebugEnabled()) {
Category& log=Category::getInstance(XMLTOOLING_LOGCAT".ParserPool");
if (log.isDebugEnabled()) {
@@
-334,14
+335,15
@@
DOMInputSource* ParserPool::resolveEntity(
}
// Find well-known schemas in the specified location.
}
// Find well-known schemas in the specified location.
- map<xstring,xstring>::const_iterator i = m_schemaLocMap.find(sys
tem
Id);
+ map<xstring,xstring>::const_iterator i = m_schemaLocMap.find(sysId);
if (i != m_schemaLocMap.end())
return new Wrapper4InputSource(new LocalFileInputSource(baseURI, i->second.c_str()));
// Check for entity as a suffix of a value in the map.
if (i != m_schemaLocMap.end())
return new Wrapper4InputSource(new LocalFileInputSource(baseURI, i->second.c_str()));
// Check for entity as a suffix of a value in the map.
+ bool (*p_ends_with)(const xstring&, const xstring&) = ends_with;
i = find_if(
m_schemaLocMap.begin(), m_schemaLocMap.end(),
i = find_if(
m_schemaLocMap.begin(), m_schemaLocMap.end(),
- boost::bind(
ends_with<const xstring&,const xstring&>, boost::bind(&map<xstring,xstring>::value_type::second, _1), systemId
)
+ boost::bind(
p_ends_with, boost::bind(&map<xstring,xstring>::value_type::second, _1), boost::ref(sysId)
)
);
if (i != m_schemaLocMap.end())
return new Wrapper4InputSource(new LocalFileInputSource(baseURI, i->second.c_str()));
);
if (i != m_schemaLocMap.end())
return new Wrapper4InputSource(new LocalFileInputSource(baseURI, i->second.c_str()));
diff --git
a/xmltooling/util/ParserPool.h
b/xmltooling/util/ParserPool.h
index
6561329
..
93c2af4
100644
(file)
--- a/
xmltooling/util/ParserPool.h
+++ b/
xmltooling/util/ParserPool.h
@@
-30,6
+30,7
@@
#include <xmltooling/unicode.h>
#include <map>
#include <xmltooling/unicode.h>
#include <map>
+#include <memory>
#include <stack>
#include <string>
#include <istream>
#include <stack>
#include <string>
#include <istream>
diff --git
a/xmltooling/util/XMLHelper.cpp
b/xmltooling/util/XMLHelper.cpp
index
be7401d
..
cdbd60b
100644
(file)
--- a/
xmltooling/util/XMLHelper.cpp
+++ b/
xmltooling/util/XMLHelper.cpp
@@
-133,7
+133,7
@@
void XMLHelper::getNonVisiblyUsedPrefixes(const XMLObject& tree, map<xstring,xst
map<xstring,xstring> child_prefixes;
for_each(
tree.getOrderedChildren().begin(), tree.getOrderedChildren().end(),
map<xstring,xstring> child_prefixes;
for_each(
tree.getOrderedChildren().begin(), tree.getOrderedChildren().end(),
- if_(_1 !=
nullptr
)[lambda::bind(&getNonVisiblyUsedPrefixes, boost::ref(*_1), boost::ref(child_prefixes))]
+ if_(_1 !=
((XMLObject*)nullptr)
)[lambda::bind(&getNonVisiblyUsedPrefixes, boost::ref(*_1), boost::ref(child_prefixes))]
);
const set<Namespace>& nsset = tree.getNamespaces();
for (set<Namespace>::const_iterator ns = nsset.begin(); ns != nsset.end(); ++ns) {
);
const set<Namespace>& nsset = tree.getNamespaces();
for (set<Namespace>::const_iterator ns = nsset.begin(); ns != nsset.end(); ++ns) {