[cpp-opensaml] branch master updated: Fix warnings/tests.

[Scott Cantor]

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

scantor pushed a commit to branch master
in repository cpp-opensaml.

View the commit online:
http://git.shibboleth.net/view/?p=cpp-opensaml.git;a=commit;h=5b8b19d4754a4a7a40e3c579cfbda0fd316fb38d

The following commit(s) were added to refs/heads/master by this push:
       new  5b8b19d   Fix warnings/tests.
5b8b19d is described below

commit 5b8b19d4754a4a7a40e3c579cfbda0fd316fb38d
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Mon Mar 26 19:08:53 2018 -0400

    Fix warnings/tests.
---
 saml/saml2/metadata/impl/AbstractDynamicMetadataProvider.cpp | 4 ++--
 saml/saml2/metadata/impl/AbstractMetadataProvider.cpp        | 2 +-
 samltest/binding.h                                           | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/saml/saml2/metadata/impl/AbstractDynamicMetadataProvider.cpp b/saml/saml2/metadata/impl/AbstractDynamicMetadataProvider.cpp
index 85c8afd..bfeec4d 100644
--- a/saml/saml2/metadata/impl/AbstractDynamicMetadataProvider.cpp
+++ b/saml/saml2/metadata/impl/AbstractDynamicMetadataProvider.cpp
@@ -71,15 +71,15 @@ static const XMLCh validate[] =             UNICODE_LITERAL_8(v,a,l,i,d,a,t,e);
 
 
 AbstractDynamicMetadataProvider::AbstractDynamicMetadataProvider(bool defaultNegativeCache, const DOMElement* e)
-  : AbstractMetadataProvider(e), MetadataProvider(e),
+  : MetadataProvider(e), AbstractMetadataProvider(e),
       m_validate(XMLHelper::getAttrBool(e, false, validate)),
         m_id(XMLHelper::getAttrString(e, "Dynamic", id)),
         m_lock(RWLock::create()),
         m_refreshDelayFactor(0.75),
         m_minCacheDuration(XMLHelper::getAttrInt(e, 600, minCacheDuration)),
         m_maxCacheDuration(XMLHelper::getAttrInt(e, 28800, maxCacheDuration)),
-        m_shutdown(false),
         m_negativeCache(XMLHelper::getAttrBool(e, defaultNegativeCache, negativeCache)),
+        m_shutdown(false),
         m_cleanupInterval(XMLHelper::getAttrInt(e, 1800, cleanupInterval)),
         m_cleanupTimeout(XMLHelper::getAttrInt(e, 1800, cleanupTimeout)),
         m_cleanup_wait(nullptr), m_cleanup_thread(nullptr)
diff --git a/saml/saml2/metadata/impl/AbstractMetadataProvider.cpp b/saml/saml2/metadata/impl/AbstractMetadataProvider.cpp
index 1acc88c..7f85f37 100644
--- a/saml/saml2/metadata/impl/AbstractMetadataProvider.cpp
+++ b/saml/saml2/metadata/impl/AbstractMetadataProvider.cpp
@@ -56,7 +56,7 @@ static const XMLCh _KeyInfoResolver[] = UNICODE_LITERAL_15(K,e,y,I,n,f,o,R,e,s,o
 static const XMLCh _type[] =            UNICODE_LITERAL_4(t,y,p,e);
 
 AbstractMetadataProvider::AbstractMetadataProvider(const DOMElement* e)
-  : ObservableMetadataProvider(e), MetadataProvider(e), m_lastUpdate(0),  m_resolver(nullptr), m_credentialLock(Mutex::create())
+  : MetadataProvider(e), ObservableMetadataProvider(e), m_lastUpdate(0),  m_resolver(nullptr), m_credentialLock(Mutex::create())
 {
     e = XMLHelper::getFirstChildElement(e, _KeyInfoResolver);
     if (e) {
diff --git a/samltest/binding.h b/samltest/binding.h
index 13cda7d..ad91bb4 100644
--- a/samltest/binding.h
+++ b/samltest/binding.h
@@ -185,7 +185,7 @@ public:
     
     // HTTPResponse methods
     
-    void setResponseHeader(const char* name, const char* value) {
+    void setResponseHeader(const char* name, const char* value, bool replace=false) {
         m_headers[name] = value ? value : "";
     }
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.