[cpp-xmltooling COMMIT] in /branches/REL_1/xmltooling: AbstractComplexElement.cpp util/ParserPool.cpp util/ParserPool...

[noreply at shibboleth.net]

Author: scantor
Date: Wed Dec 14 08:49:07 2011
New Revision: 936

URL: http://svn.shibboleth.net/view/cpp-xmltooling?rev=936&view=rev
Log:
Fix some gcc compiler issues

Modified:
    branches/REL_1/xmltooling/AbstractComplexElement.cpp
    branches/REL_1/xmltooling/util/ParserPool.cpp
    branches/REL_1/xmltooling/util/ParserPool.h
    branches/REL_1/xmltooling/util/XMLHelper.cpp

Modified: branches/REL_1/xmltooling/AbstractComplexElement.cpp
URL: http://svn.shibboleth.net/view/cpp-xmltooling/branches/REL_1/xmltooling/AbstractComplexElement.cpp?rev=936&r1=935&r2=936&view=diff
==============================================================================
--- branches/REL_1/xmltooling/AbstractComplexElement.cpp (original)
+++ branches/REL_1/xmltooling/AbstractComplexElement.cpp Wed Dec 14 08:49:07 2011
@@ -64,7 +64,7 @@
 {
     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

Modified: branches/REL_1/xmltooling/util/ParserPool.cpp
URL: http://svn.shibboleth.net/view/cpp-xmltooling/branches/REL_1/xmltooling/util/ParserPool.cpp?rev=936&r1=935&r2=936&view=diff
==============================================================================
--- branches/REL_1/xmltooling/util/ParserPool.cpp (original)
+++ branches/REL_1/xmltooling/util/ParserPool.cpp Wed Dec 14 08:49:07 2011
@@ -325,6 +325,7 @@
 #endif
     if (!systemId)
         return nullptr;
+    xstring sysId(systemId);
 
     Category& log=Category::getInstance(XMLTOOLING_LOGCAT".ParserPool");
     if (log.isDebugEnabled()) {
@@ -334,14 +335,15 @@
     }
 
     // Find well-known schemas in the specified location.
-    map<xstring,xstring>::const_iterator i = m_schemaLocMap.find(systemId);
+    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.
+    bool (*p_ends_with)(const xstring&, const xstring&) = ends_with;
     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()));

Modified: branches/REL_1/xmltooling/util/ParserPool.h
URL: http://svn.shibboleth.net/view/cpp-xmltooling/branches/REL_1/xmltooling/util/ParserPool.h?rev=936&r1=935&r2=936&view=diff
==============================================================================
--- branches/REL_1/xmltooling/util/ParserPool.h (original)
+++ branches/REL_1/xmltooling/util/ParserPool.h Wed Dec 14 08:49:07 2011
@@ -30,6 +30,7 @@
 #include <xmltooling/unicode.h>
 
 #include <map>
+#include <memory>
 #include <stack>
 #include <string>
 #include <istream>

Modified: branches/REL_1/xmltooling/util/XMLHelper.cpp
URL: http://svn.shibboleth.net/view/cpp-xmltooling/branches/REL_1/xmltooling/util/XMLHelper.cpp?rev=936&r1=935&r2=936&view=diff
==============================================================================
--- branches/REL_1/xmltooling/util/XMLHelper.cpp (original)
+++ branches/REL_1/xmltooling/util/XMLHelper.cpp Wed Dec 14 08:49:07 2011
@@ -133,7 +133,7 @@
     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) {