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

[noreply at shibboleth.net]

Author: scantor
Date: Tue Jan 10 20:55:02 2012
New Revision: 3555

URL: http://svn.shibboleth.net/view/cpp-sp?rev=3555&view=rev
Log:
Boost changes

Modified:
    branches/REL_2/shibsp/attribute/filtering/impl/AndMatchFunctor.cpp
    branches/REL_2/shibsp/attribute/filtering/impl/AttributeIssuerRegexFunctor.cpp
    branches/REL_2/shibsp/attribute/filtering/impl/AttributeIssuerStringFunctor.cpp
    branches/REL_2/shibsp/attribute/filtering/impl/AttributeRequesterRegexFunctor.cpp
    branches/REL_2/shibsp/attribute/filtering/impl/AttributeRequesterStringFunctor.cpp
    branches/REL_2/shibsp/attribute/filtering/impl/AttributeScopeMatchesShibMDScopeFunctor.cpp
    branches/REL_2/shibsp/attribute/filtering/impl/AttributeScopeRegexFunctor.cpp
    branches/REL_2/shibsp/attribute/filtering/impl/AttributeScopeStringFunctor.cpp
    branches/REL_2/shibsp/attribute/filtering/impl/AttributeValueRegexFunctor.cpp
    branches/REL_2/shibsp/attribute/filtering/impl/AttributeValueStringFunctor.cpp
    branches/REL_2/shibsp/attribute/filtering/impl/AuthenticationMethodRegexFunctor.cpp
    branches/REL_2/shibsp/attribute/filtering/impl/ChainingAttributeFilter.cpp
    branches/REL_2/shibsp/attribute/filtering/impl/NotMatchFunctor.cpp
    branches/REL_2/shibsp/attribute/filtering/impl/OrMatchFunctor.cpp
    branches/REL_2/shibsp/attribute/filtering/impl/XMLAttributeFilter.cpp
    branches/REL_2/shibsp/attribute/resolver/impl/AssertionAttributeExtractor.cpp
    branches/REL_2/shibsp/attribute/resolver/impl/ChainingAttributeExtractor.cpp
    branches/REL_2/shibsp/attribute/resolver/impl/ChainingAttributeResolver.cpp
    branches/REL_2/shibsp/attribute/resolver/impl/DelegationAttributeExtractor.cpp
    branches/REL_2/shibsp/attribute/resolver/impl/KeyDescriptorAttributeExtractor.cpp
    branches/REL_2/shibsp/attribute/resolver/impl/QueryAttributeResolver.cpp
    branches/REL_2/shibsp/attribute/resolver/impl/SimpleAggregationAttributeResolver.cpp
    branches/REL_2/shibsp/attribute/resolver/impl/XMLAttributeExtractor.cpp
    branches/REL_2/shibsp/handler/AssertionConsumerService.h
    branches/REL_2/shibsp/handler/impl/AbstractHandler.cpp
    branches/REL_2/shibsp/handler/impl/AssertionConsumerService.cpp
    branches/REL_2/shibsp/handler/impl/AssertionLookup.cpp
    branches/REL_2/shibsp/handler/impl/ChainingLogoutInitiator.cpp
    branches/REL_2/shibsp/handler/impl/ChainingSessionInitiator.cpp
    branches/REL_2/shibsp/handler/impl/DiscoveryFeed.cpp
    branches/REL_2/shibsp/handler/impl/LocalLogoutInitiator.cpp
    branches/REL_2/shibsp/handler/impl/LogoutHandler.cpp
    branches/REL_2/shibsp/handler/impl/MetadataGenerator.cpp
    branches/REL_2/shibsp/handler/impl/RemotedHandler.cpp
    branches/REL_2/shibsp/handler/impl/SAML1Consumer.cpp
    branches/REL_2/shibsp/handler/impl/SAML2ArtifactResolution.cpp
    branches/REL_2/shibsp/handler/impl/SAML2Consumer.cpp
    branches/REL_2/shibsp/handler/impl/SAML2Logout.cpp
    branches/REL_2/shibsp/handler/impl/SAML2LogoutInitiator.cpp
    branches/REL_2/shibsp/handler/impl/SAML2NameIDMgmt.cpp
    branches/REL_2/shibsp/handler/impl/SAML2SessionInitiator.cpp
    branches/REL_2/shibsp/handler/impl/SAMLDSSessionInitiator.cpp
    branches/REL_2/shibsp/handler/impl/SessionHandler.cpp
    branches/REL_2/shibsp/handler/impl/Shib1SessionInitiator.cpp
    branches/REL_2/shibsp/handler/impl/StatusHandler.cpp
    branches/REL_2/shibsp/handler/impl/TransformSessionInitiator.cpp
    branches/REL_2/shibsp/handler/impl/WAYFSessionInitiator.cpp
    branches/REL_2/shibsp/impl/StorageServiceSessionCache.cpp
    branches/REL_2/shibsp/util/CGIParser.cpp
    branches/REL_2/shibsp/util/DOMPropertySet.cpp
    branches/REL_2/shibsp/util/DOMPropertySet.h

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=3555&r1=3554&r2=3555&view=diff
==============================================================================
--- branches/REL_2/shibsp/attribute/filtering/impl/AndMatchFunctor.cpp (original)
+++ branches/REL_2/shibsp/attribute/filtering/impl/AndMatchFunctor.cpp Tue Jan 10 20:55:02 2012
@@ -30,11 +30,16 @@
 #include "attribute/filtering/MatchFunctor.h"
 #include "util/SPConstants.h"
 
+#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;
 
 namespace shibsp {
@@ -50,19 +55,21 @@
         bool evaluatePolicyRequirement(const FilteringContext& filterContext) const {
             if (m_functors.empty())
                 return false;
-            for (vector<const MatchFunctor*>::const_iterator mf = m_functors.begin(); mf!=m_functors.end(); ++mf)
-                if (!(*mf)->evaluatePolicyRequirement(filterContext))
-                    return false;
-            return true;

[... 7379 lines stripped ...]