[cpp-opensaml COMMIT] in /branches/REL_2/saml/saml2/metadata/impl: DiscoverableMetadataProvider.cpp EntityRoleMetadat...

[noreply at shibboleth.net]

Author: scantor
Date: Sun Dec 25 01:38:45 2011
New Revision: 695

URL: http://svn.shibboleth.net/view/cpp-opensaml?rev=695&view=rev
Log:
Solaris fixes

Modified:
    branches/REL_2/saml/saml2/metadata/impl/DiscoverableMetadataProvider.cpp
    branches/REL_2/saml/saml2/metadata/impl/EntityRoleMetadataFilter.cpp
    branches/REL_2/saml/saml2/metadata/impl/WhitelistMetadataFilter.cpp

Modified: branches/REL_2/saml/saml2/metadata/impl/DiscoverableMetadataProvider.cpp
URL: http://svn.shibboleth.net/view/cpp-opensaml/branches/REL_2/saml/saml2/metadata/impl/DiscoverableMetadataProvider.cpp?rev=695&r1=694&r2=695&view=diff
==============================================================================
--- branches/REL_2/saml/saml2/metadata/impl/DiscoverableMetadataProvider.cpp (original)
+++ branches/REL_2/saml/saml2/metadata/impl/DiscoverableMetadataProvider.cpp Sun Dec 25 01:38:45 2011
@@ -304,11 +304,11 @@
     if (group) {
         for_each(
             group->getEntitiesDescriptors().begin(), group->getEntitiesDescriptors().end(),
-            boost::bind(&DiscoverableMetadataProvider::discoGroup, boost::ref(this), boost::ref(s), _1, boost::ref(first))
+            boost::bind(&DiscoverableMetadataProvider::discoGroup, this, boost::ref(s), _1, boost::ref(first))
             );
         for_each(
             group->getEntityDescriptors().begin(), group->getEntityDescriptors().end(),
-            boost::bind(&DiscoverableMetadataProvider::discoEntity, boost::ref(this), boost::ref(s), _1, boost::ref(first))
+            boost::bind(&DiscoverableMetadataProvider::discoEntity, this, boost::ref(s), _1, boost::ref(first))
             );
     }
 }

Modified: branches/REL_2/saml/saml2/metadata/impl/EntityRoleMetadataFilter.cpp
URL: http://svn.shibboleth.net/view/cpp-opensaml/branches/REL_2/saml/saml2/metadata/impl/EntityRoleMetadataFilter.cpp?rev=695&r1=694&r2=695&view=diff
==============================================================================
--- branches/REL_2/saml/saml2/metadata/impl/EntityRoleMetadataFilter.cpp (original)
+++ branches/REL_2/saml/saml2/metadata/impl/EntityRoleMetadataFilter.cpp Sun Dec 25 01:38:45 2011
@@ -28,7 +28,6 @@
 #include "saml2/metadata/Metadata.h"
 #include "saml2/metadata/MetadataFilter.h"
 
-#include <boost/ptr_container/ptr_set.hpp>
 #include <xmltooling/logging.h>
 #include <xmltooling/util/NDC.h>
 
@@ -55,7 +54,7 @@
             void doFilter(EntitiesDescriptor& entities) const;
 
             bool m_removeRolelessEntityDescriptors, m_removeEmptyEntitiesDescriptors;
-            ptr_set<xmltooling::QName> m_roles;
+            set<xmltooling::QName> m_roles;
             bool m_idp, m_sp, m_authn, m_attr, m_pdp, m_authnq, m_attrq, m_authzq;
         };
 
@@ -97,7 +96,7 @@
             else if (*q == AuthzDecisionQueryDescriptorType::TYPE_QNAME)
                 m_authzq = true;
             else
-                m_roles.insert(q);
+                m_roles.insert(*q);
         }
         e = XMLHelper::getNextSiblingElement(e, RetainedRole);
     }

Modified: branches/REL_2/saml/saml2/metadata/impl/WhitelistMetadataFilter.cpp
URL: http://svn.shibboleth.net/view/cpp-opensaml/branches/REL_2/saml/saml2/metadata/impl/WhitelistMetadataFilter.cpp?rev=695&r1=694&r2=695&view=diff
==============================================================================
--- branches/REL_2/saml/saml2/metadata/impl/WhitelistMetadataFilter.cpp (original)
+++ branches/REL_2/saml/saml2/metadata/impl/WhitelistMetadataFilter.cpp Sun Dec 25 01:38:45 2011
@@ -130,7 +130,7 @@
     for_each(
         make_indirect_iterator(groups.begin()), make_indirect_iterator(groups.end()),
         boost::bind(
-            static_cast<void (WhitelistMetadataFilter::*)(EntitiesDescriptor&) const>(&WhitelistMetadataFilter::doFilter), boost::ref(this), _1
+            static_cast<void (WhitelistMetadataFilter::*)(EntitiesDescriptor&) const>(&WhitelistMetadataFilter::doFilter), this, _1
             )
         );
 }