[cpp-sp COMMIT] in /branches/REL_2/shibsp: attribute/filtering/impl/AndMatchFunctor.cpp attribute/filtering/impl/OrMa...

[noreply at shibboleth.net]

Author: scantor
Date: Wed Jan 11 17:46:24 2012
New Revision: 3557

URL: http://svn.shibboleth.net/view/cpp-sp?rev=3557&view=rev
Log:
Debian can't bind abstract classes

Modified:
    branches/REL_2/shibsp/attribute/filtering/impl/AndMatchFunctor.cpp
    branches/REL_2/shibsp/attribute/filtering/impl/OrMatchFunctor.cpp
    branches/REL_2/shibsp/impl/XMLAccessControl.cpp
    branches/REL_2/shibsp/impl/XMLSecurityPolicyProvider.cpp

Modified: branches/REL_2/shibsp/attribute/filtering/impl/AndMatchFunctor.cpp
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/shibsp/attribute/filtering/impl/AndMatchFunctor.cpp?rev=3557&r1=3556&r2=3557&view=diff
==============================================================================
--- branches/REL_2/shibsp/attribute/filtering/impl/AndMatchFunctor.cpp (original)
+++ branches/REL_2/shibsp/attribute/filtering/impl/AndMatchFunctor.cpp Wed Jan 11 17:46:24 2012
@@ -30,15 +30,13 @@
 #include "attribute/filtering/MatchFunctor.h"
 #include "util/SPConstants.h"
 
+#include <boost/bind.hpp>
 #include <boost/scoped_ptr.hpp>
-#include <boost/lambda/bind.hpp>
-#include <boost/lambda/lambda.hpp>
 #include <xercesc/util/XMLUniDefs.hpp>
 #include <xmltooling/util/XMLHelper.h>
 
 using namespace shibsp;
 using namespace xmltooling;
-using namespace boost::lambda;
 using namespace boost;
 using namespace std;
 
@@ -57,7 +55,7 @@
                 return false;
             vector<const MatchFunctor*>::const_iterator i = find_if(
                 m_functors.begin(), m_functors.end(),
-                lambda::bind(&MatchFunctor::evaluatePolicyRequirement, _1, boost::ref(filterContext)) == false
+                boost::bind(&MatchFunctor::evaluatePolicyRequirement, _1, boost::cref(filterContext)) == false
                 );
             return (i == m_functors.end());
         }
@@ -67,7 +65,7 @@
                 return false;
             vector<const MatchFunctor*>::const_iterator i = find_if(
                 m_functors.begin(), m_functors.end(),
-                lambda::bind(&MatchFunctor::evaluatePermitValue, _1, boost::ref(filterContext), boost::ref(attribute), index) == false
+                boost::bind(&MatchFunctor::evaluatePermitValue, _1, boost::cref(filterContext), boost::cref(attribute), index) == false
                 );
             return (i == m_functors.end());
         }

Modified: branches/REL_2/shibsp/attribute/filtering/impl/OrMatchFunctor.cpp
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/shibsp/attribute/filtering/impl/OrMatchFunctor.cpp?rev=3557&r1=3556&r2=3557&view=diff
==============================================================================
--- branches/REL_2/shibsp/attribute/filtering/impl/OrMatchFunctor.cpp (original)
+++ branches/REL_2/shibsp/attribute/filtering/impl/OrMatchFunctor.cpp Wed Jan 11 17:46:24 2012
@@ -30,15 +30,13 @@
 #include "attribute/filtering/MatchFunctor.h"
 #include "util/SPConstants.h"
 
+#include <boost/bind.hpp>
 #include <boost/scoped_ptr.hpp>
-#include <boost/lambda/bind.hpp>
-#include <boost/lambda/lambda.hpp>
 #include <xercesc/util/XMLUniDefs.hpp>
 #include <xmltooling/util/XMLHelper.h>
 
 using namespace shibsp;
 using namespace xmltooling;
-using namespace boost::lambda;
 using namespace boost;
 using namespace std;
 
@@ -55,7 +53,7 @@
         bool evaluatePolicyRequirement(const FilteringContext& filterContext) const {
             vector<const MatchFunctor*>::const_iterator i = find_if(
                 m_functors.begin(), m_functors.end(),
-                lambda::bind(&MatchFunctor::evaluatePolicyRequirement, _1, boost::ref(filterContext)) == true
+                boost::bind(&MatchFunctor::evaluatePolicyRequirement, _1, boost::cref(filterContext)) == true
                 );
             return (i != m_functors.end());
         }
@@ -63,7 +61,7 @@
         bool evaluatePermitValue(const FilteringContext& filterContext, const Attribute& attribute, size_t index) const {
             vector<const MatchFunctor*>::const_iterator i = find_if(
                 m_functors.begin(), m_functors.end(),
-                lambda::bind(&MatchFunctor::evaluatePermitValue, _1, boost::ref(filterContext), boost::ref(attribute), index) == true
+                boost::bind(&MatchFunctor::evaluatePermitValue, _1, boost::cref(filterContext), boost::cref(attribute), index) == true
                 );
             return (i != m_functors.end());
         }

Modified: branches/REL_2/shibsp/impl/XMLAccessControl.cpp
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/shibsp/impl/XMLAccessControl.cpp?rev=3557&r1=3556&r2=3557&view=diff
==============================================================================
--- branches/REL_2/shibsp/impl/XMLAccessControl.cpp (original)
+++ branches/REL_2/shibsp/impl/XMLAccessControl.cpp Wed Jan 11 17:46:24 2012
@@ -33,9 +33,8 @@
 
 #include <algorithm>
 #include <boost/scoped_ptr.hpp>
+#include <boost/bind.hpp>
 #include <boost/algorithm/string.hpp>
-#include <boost/lambda/bind.hpp>
-#include <boost/lambda/lambda.hpp>
 #include <boost/ptr_container/ptr_vector.hpp>
 #include <xmltooling/unicode.h>

[... 51 lines stripped ...]