[cpp-sp] branch master updated: SSPCPP-847 - Macport build fails with linker error

[Scott Cantor]

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

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

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

The following commit(s) were added to refs/heads/master by this push:
       new  e8cc596   SSPCPP-847 - Macport build fails with linker error
e8cc596 is described below

commit e8cc59684b10c9142a5f363c6105dcef3649ff7f
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Mon Jan 14 14:34:18 2019 -0500

    SSPCPP-847 - Macport build fails with linker error
    
    https://issues.shibboleth.net/jira/browse/SSPCPP-847
    
    Fix the "known" instance that's breaking the build.
---
 shibsp/Application.cpp | 24 ++++++------------------
 1 file changed, 6 insertions(+), 18 deletions(-)

diff --git a/shibsp/Application.cpp b/shibsp/Application.cpp
index c9f858e..bc33bca 100644
--- a/shibsp/Application.cpp
+++ b/shibsp/Application.cpp
@@ -109,15 +109,9 @@ string Application::getSecureHeader(const SPRequest& request, const char* name)
 void Application::clearAttributeHeaders(SPRequest& request) const
 {
     if (SPConfig::getConfig().isEnabled(SPConfig::OutOfProcess)) {
-        for_each(
-            m_unsetHeaders.begin(), m_unsetHeaders.end(),
-            boost::bind(
-                &SPRequest::clearHeader,
-                boost::ref(request),
-                boost::bind(&string::c_str, boost::bind(&pair<string,string>::first, _1)),
-                boost::bind(&string::c_str, boost::bind(&pair<string,string>::second, _1))
-                )
-            );
+        for (vector< pair<string,string> >::const_iterator i = m_unsetHeaders.begin(); i != m_unsetHeaders.end(); ++i) {
+            request.clearHeader(i->first.c_str(), i->second.c_str());
+        }
         return;
     }
 
@@ -148,15 +142,9 @@ void Application::clearAttributeHeaders(SPRequest& request) const
 
     // Now holding read lock.
     SharedLock unsetLock(m_lock, false);
-    for_each(
-        m_unsetHeaders.begin(), m_unsetHeaders.end(),
-        boost::bind(
-            &SPRequest::clearHeader,
-            boost::ref(request),
-            boost::bind(&string::c_str, boost::bind(&pair<string,string>::first, _1)),
-            boost::bind(&string::c_str, boost::bind(&pair<string,string>::second, _1))
-            )
-        );
+    for (vector< pair<string,string> >::const_iterator i = m_unsetHeaders.begin(); i != m_unsetHeaders.end(); ++i) {
+        request.clearHeader(i->first.c_str(), i->second.c_str());
+    }
 }
 
 void Application::limitRedirect(const GenericRequest& request, const char* url) const

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