Last sec draft std adjustment

git-svn-id: https://svn.middleware.georgetown.edu/cpp-sp/trunk@1094 cb58f699-b61c-0410-a6fe-9272a202ed29

diff --git a/shib/shib.h b/shib/shib.h
index 30c314e..20c2b7e 100644 (file)
--- a/shib/shib.h
+++ b/shib/shib.h
@@ -184,13 +184,13 @@ namespace shibboleth
     {
         virtual saml::Iterator<const IEndpoint*> getSingleLogoutServices() const=0;
         virtual saml::Iterator<const IEndpoint*> getManageNameIdentifierServices() const=0;
-        virtual saml::Iterator<const IEndpoint*> getNameIdentifierMappingServices() const=0;
         virtual ~ISSOProviderRole() {}
     };
     
     struct SHIB_EXPORTS IIDPProviderRole : public virtual ISSOProviderRole
     {
         virtual saml::Iterator<const IEndpoint*> getSingleSignOnServices() const=0;
+        virtual saml::Iterator<const IEndpoint*> getNameIdentifierMappingServices() const=0;
         virtual ~IIDPProviderRole() {}
     };
     
@@ -219,7 +219,7 @@ namespace shibboleth
     {
         virtual const XMLCh* getName(const XMLCh* lang) const=0;
         virtual const XMLCh* getDescription(const XMLCh* lang) const=0;
-        virtual saml::Iterator<std::pair<const saml::SAMLAttributeDesignator*,bool> > getRequestedAttributes() const=0;
+        virtual saml::Iterator<std::pair<const saml::SAMLAttribute*,bool> > getRequestedAttributes() const=0;
         virtual const DOMElement* getElement() const=0;
         virtual ~IAttributeRequestingService() {}
     };

diff --git a/xmlproviders/XMLMetadata.cpp b/xmlproviders/XMLMetadata.cpp
index 993fed4..6e4df68 100644 (file)
--- a/xmlproviders/XMLMetadata.cpp
+++ b/xmlproviders/XMLMetadata.cpp
@@ -167,7 +167,6 @@ namespace {
             ~SSORole() {}
             Iterator<const IEndpoint*> getSingleLogoutServices() const {return EMPTY(const IEndpoint*);}
             Iterator<const IEndpoint*> getManageNameIdentifierServices() const {return EMPTY(const IEndpoint*);}
-            Iterator<const IEndpoint*> getNameIdentifierMappingServices() const {return EMPTY(const IEndpoint*);}
         };
         
         class IDPRole : public SSORole, public virtual IIDPProviderRole
@@ -176,6 +175,7 @@ namespace {
             IDPRole(const Provider* provider, const DOMElement* e) : SSORole(provider,e) {m_protocolEnum.push_back(::XML::SHIB_NS);}
             ~IDPRole() {}
             Iterator<const IEndpoint*> getSingleSignOnServices() const {return m_pepv;}
+            Iterator<const IEndpoint*> getNameIdentifierMappingServices() const {return EMPTY(const IEndpoint*);}
         
         private:
             vector<Endpoint> m_epv;