Reducing header overuse, non-inlining selected methods (CPPOST-35).

[shibboleth/cpp-opensaml.git] / saml / saml2 / metadata / impl / AbstractMetadataProvider.cpp

diff --git a/saml/saml2/metadata/impl/AbstractMetadataProvider.cpp b/saml/saml2/metadata/impl/AbstractMetadataProvider.cpp
index 7fa8431..2852bb6 100644 (file)
--- a/saml/saml2/metadata/impl/AbstractMetadataProvider.cpp
+++ b/saml/saml2/metadata/impl/AbstractMetadataProvider.cpp
@@ -28,6 +28,7 @@
 #include "saml2/metadata/MetadataCredentialCriteria.h"
 
 #include <xercesc/util/XMLUniDefs.hpp>
+#include <xmltooling/XMLToolingConfig.h>
 #include <xmltooling/security/KeyInfoResolver.h>
 #include <xmltooling/util/XMLHelper.h>
 
@@ -163,7 +164,7 @@ void AbstractMetadataProvider::clearDescriptorIndex(bool freeSites)
 
 const EntitiesDescriptor* AbstractMetadataProvider::getEntitiesDescriptor(const char* name, bool strict) const
 {
-    pair<groupmap_t::const_iterator,groupmap_t::const_iterator> range=m_groups.equal_range(name);
+    pair<groupmap_t::const_iterator,groupmap_t::const_iterator> range=const_cast<const groupmap_t&>(m_groups).equal_range(name);
 
     time_t now=time(NULL);
     for (groupmap_t::const_iterator i=range.first; i!=range.second; i++)
@@ -180,13 +181,13 @@ pair<const EntityDescriptor*,const RoleDescriptor*> AbstractMetadataProvider::ge
 {
     pair<sitemap_t::const_iterator,sitemap_t::const_iterator> range;
     if (criteria.entityID_ascii)
-        range = m_sites.equal_range(criteria.entityID_ascii);
+        range = const_cast<const sitemap_t&>(m_sites).equal_range(criteria.entityID_ascii);
     else if (criteria.entityID_unicode) {
         auto_ptr_char id(criteria.entityID_unicode);
-        range = m_sites.equal_range(id.get());
+        range = const_cast<const sitemap_t&>(m_sites).equal_range(id.get());
     }
     else if (criteria.artifact)
-        range = m_sources.equal_range(criteria.artifact->getSource());
+        range = const_cast<const sitemap_t&>(m_sources).equal_range(criteria.artifact->getSource());
     else
         return pair<const EntityDescriptor*,const RoleDescriptor*>(NULL,NULL);
     
@@ -205,7 +206,7 @@ pair<const EntityDescriptor*,const RoleDescriptor*> AbstractMetadataProvider::ge
     if (!result.first && !criteria.validOnly && range.first!=range.second)
         result.first = range.first->second;
         
-    if (result.first && criteria.role && criteria.protocol) {
+    if (result.first && criteria.role) {
         result.second = result.first->getRoleDescriptor(*criteria.role, criteria.protocol);
         if (!result.second && criteria.protocol2)
             result.second = result.first->getRoleDescriptor(*criteria.role, criteria.protocol2);