[opensaml2] 10/11: SSPCPP-756 move init method

[Etienne Dysli Metref]

This is an automated email from the git hooks/post-receive script.

edm-guest pushed a commit to branch master
in repository opensaml2.

commit 0a380cfb94dabffa5fbce33820750469197dc6a4
Author: Rod Widdowson <rdw at steadingsoftware.com>
Date:   Wed Nov 8 17:20:14 2017 +0000

    SSPCPP-756 move init method
    
    https://issues.shibboleth.net/jira/browse/SSPCPP-756
    
    Move it to the top of class hierarchy (where it belongs)
---
 saml/saml2/metadata/AbstractDynamicMetadataProvider.h        | 1 -
 saml/saml2/metadata/DynamicMetadataProvider.h                | 2 ++
 saml/saml2/metadata/impl/AbstractDynamicMetadataProvider.cpp | 4 ----
 saml/saml2/metadata/impl/DynamicMetadataProvider.cpp         | 4 ++++
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/saml/saml2/metadata/AbstractDynamicMetadataProvider.h b/saml/saml2/metadata/AbstractDynamicMetadataProvider.h
index 6392f9f..934685a 100644
--- a/saml/saml2/metadata/AbstractDynamicMetadataProvider.h
+++ b/saml/saml2/metadata/AbstractDynamicMetadataProvider.h
@@ -55,7 +55,6 @@ namespace opensaml {
 
             virtual ~AbstractDynamicMetadataProvider();
 
-            void init();
             xmltooling::Lockable* lock();
             void unlock();
             const char* getId() const;
diff --git a/saml/saml2/metadata/DynamicMetadataProvider.h b/saml/saml2/metadata/DynamicMetadataProvider.h
index d62ecd8..29baa18 100644
--- a/saml/saml2/metadata/DynamicMetadataProvider.h
+++ b/saml/saml2/metadata/DynamicMetadataProvider.h
@@ -45,6 +45,8 @@ namespace opensaml {
              */
             DynamicMetadataProvider(const xercesc::DOMElement* e=nullptr);
 
+            void init();
+
         protected:
             virtual EntityDescriptor* resolve(const Criteria& criteria) const;
 
diff --git a/saml/saml2/metadata/impl/AbstractDynamicMetadataProvider.cpp b/saml/saml2/metadata/impl/AbstractDynamicMetadataProvider.cpp
index f2ad78d..7fe90df 100644
--- a/saml/saml2/metadata/impl/AbstractDynamicMetadataProvider.cpp
+++ b/saml/saml2/metadata/impl/AbstractDynamicMetadataProvider.cpp
@@ -205,10 +205,6 @@ void AbstractDynamicMetadataProvider::unlock()
     m_lock->unlock();
 }
 
-void AbstractDynamicMetadataProvider::init()
-{
-}
-
 const char* AbstractDynamicMetadataProvider::getId() const
 {
     return m_id.c_str();
diff --git a/saml/saml2/metadata/impl/DynamicMetadataProvider.cpp b/saml/saml2/metadata/impl/DynamicMetadataProvider.cpp
index 1cdb624..35bd84c 100644
--- a/saml/saml2/metadata/impl/DynamicMetadataProvider.cpp
+++ b/saml/saml2/metadata/impl/DynamicMetadataProvider.cpp
@@ -83,6 +83,10 @@ DynamicMetadataProvider::DynamicMetadataProvider(const DOMElement* e)
 {
 }
 
+void DynamicMetadataProvider::init()
+{
+}
+
 EntityDescriptor* DynamicMetadataProvider::resolve(const Criteria& criteria) const
 {
     string name;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-shibboleth/opensaml2.git