Xerces 3 revisions.

[shibboleth/cpp-sp.git] / shibsp / attribute / filtering / impl / OrMatchFunctor.cpp

diff --git a/shibsp/attribute/filtering/impl/OrMatchFunctor.cpp b/shibsp/attribute/filtering/impl/OrMatchFunctor.cpp
index 32c6f2a..2649f42 100644 (file)
--- a/shibsp/attribute/filtering/impl/OrMatchFunctor.cpp
+++ b/shibsp/attribute/filtering/impl/OrMatchFunctor.cpp
@@ -62,7 +62,7 @@ namespace shibsp {
         vector<const MatchFunctor*> m_functors;
     };
 
-    MatchFunctor* SHIBSP_DLLLOCAL OrFunctorFactory(const pair<const FilterPolicyContext*,const DOMElement*>& p)
+    MatchFunctor* SHIBSP_DLLLOCAL OrMatchFunctorFactory(const pair<const FilterPolicyContext*,const DOMElement*>& p)
     {
         return new OrMatchFunctor(p);
     }
@@ -105,11 +105,11 @@ MatchFunctor* OrMatchFunctor::buildFunctor(const DOMElement* e, const FilterPoli
     if (*id && functorMap->getMatchFunctors().count(id))
         id = "";
 
-    auto_ptr<QName> type(XMLHelper::getXSIType(e));
+    auto_ptr<xmltooling::QName> type(XMLHelper::getXSIType(e));
     if (!type.get())
         throw ConfigurationException("Child Rule found with no xsi:type.");
 
     MatchFunctor* func = SPConfig::getConfig().MatchFunctorManager.newPlugin(*type.get(), make_pair(functorMap,e));
-    functorMap->getMatchFunctors().insert(make_pair(id, func));
+    functorMap->getMatchFunctors().insert(multimap<string,MatchFunctor*>::value_type(id, func));
     return func;
 }