Method scoping and map insert fixes.

[shibboleth/opensaml2.git] / saml / saml2 / metadata / ChainingMetadataProvider.h

diff --git a/saml/saml2/metadata/ChainingMetadataProvider.h b/saml/saml2/metadata/ChainingMetadataProvider.h
index 2de6229..5dc0f46 100644 (file)
--- a/saml/saml2/metadata/ChainingMetadataProvider.h
+++ b/saml/saml2/metadata/ChainingMetadataProvider.h
@@ -15,7 +15,7 @@
  */
 
 /**
- * @file saml/security/ChainingMetadataProvider.h
+ * @file saml/saml2/metadata/ChainingMetadataProvider.h
  * 
  * MetadataProvider that uses multiple providers in sequence.
  */
@@ -53,7 +53,7 @@ namespace opensaml {
              * 
              * @param e DOM to supply configuration for provider
              */
-            ChainingMetadataProvider(const DOMElement* e=NULL);
+            ChainingMetadataProvider(const xercesc::DOMElement* e=NULL);
             
             /**
              * Destructor will delete any embedded engines.
@@ -86,6 +86,9 @@ namespace opensaml {
                 return NULL;
             }
 
+            using MetadataProvider::getEntityDescriptor;
+            using MetadataProvider::getEntitiesDescriptor;
+
             xmltooling::Lockable* lock();
             void unlock();
             void init();
@@ -93,7 +96,7 @@ namespace opensaml {
             const EntitiesDescriptor* getEntitiesDescriptor(const char* name, bool requireValidMetadata=true) const;
             const EntityDescriptor* getEntityDescriptor(const char* id, bool requireValidMetadata=true) const;
             const EntityDescriptor* getEntityDescriptor(const SAMLArtifact* artifact) const;
-            void onEvent(MetadataProvider& provider);
+            void onEvent(const ObservableMetadataProvider& provider) const;
     
             const xmltooling::Credential* resolve(const xmltooling::CredentialCriteria* criteria=NULL) const;
             std::vector<const xmltooling::Credential*>::size_type resolve(