[cpp-sp COMMIT] in /branches/REL_2: plugins/TransformAttributeResolver.cpp shibsp/attribute/filtering/impl/XMLAttribu...

[noreply at shibboleth.net]

Author: scantor
Date: Thu Jan 22 20:31:59 2015
New Revision: 3899

URL: http://svn.shibboleth.net/view/cpp-sp?rev=3899&view=rev
Log:
SSPCPP-616 - fix tuple namespaces and string literal errors

Modified:
    branches/REL_2/plugins/TransformAttributeResolver.cpp
    branches/REL_2/shibsp/attribute/filtering/impl/XMLAttributeFilter.cpp
    branches/REL_2/shibsp/attribute/resolver/impl/ChainingAttributeResolver.cpp
    branches/REL_2/shibsp/attribute/resolver/impl/MetadataAttributeExtractor.cpp
    branches/REL_2/shibsp/attribute/resolver/impl/XMLAttributeExtractor.cpp
    branches/REL_2/shibsp/impl/XMLRequestMapper.cpp
    branches/REL_2/shibsp/impl/XMLServiceProvider.cpp

Modified: branches/REL_2/plugins/TransformAttributeResolver.cpp
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/plugins/TransformAttributeResolver.cpp?rev=3899&r1=3898&r2=3899&view=diff
==============================================================================
--- branches/REL_2/plugins/TransformAttributeResolver.cpp (original)
+++ branches/REL_2/plugins/TransformAttributeResolver.cpp Thu Jan 22 20:31:59 2015
@@ -132,7 +132,7 @@
         Category& m_log;
         string m_source;
         // dest id, regex to apply, replacement string
-        typedef tuple<string,boost::shared_ptr<RegularExpression>,const XMLCh*> regex_t;
+        typedef boost::tuple<string,boost::shared_ptr<RegularExpression>,const XMLCh*> regex_t;
         vector<regex_t> m_regex;
     };
 
@@ -168,7 +168,7 @@
                 try {
                     static XMLCh options[] = { chLatin_i, chNull };
                     boost::shared_ptr<RegularExpression> re(new RegularExpression(e->getAttributeNS(nullptr, match), (caseflag ? &chNull : options)));
-                    m_regex.push_back(make_tuple(destId, re, repl));
+                    m_regex.push_back(boost::make_tuple(destId, re, repl));
                 }
                 catch (XMLException& ex) {
                     auto_ptr_char msg(ex.getMessage());

Modified: branches/REL_2/shibsp/attribute/filtering/impl/XMLAttributeFilter.cpp
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/shibsp/attribute/filtering/impl/XMLAttributeFilter.cpp?rev=3899&r1=3898&r2=3899&view=diff
==============================================================================
--- branches/REL_2/shibsp/attribute/filtering/impl/XMLAttributeFilter.cpp (original)
+++ branches/REL_2/shibsp/attribute/filtering/impl/XMLAttributeFilter.cpp Thu Jan 22 20:31:59 2015
@@ -90,14 +90,14 @@
         MatchFunctor* buildFunctor(
             const DOMElement* e, const FilterPolicyContext& functorMap, const char* logname, bool standalone
             );
-        tuple<string,const MatchFunctor*,const MatchFunctor*> buildAttributeRule(
+        boost::tuple<string,const MatchFunctor*,const MatchFunctor*> buildAttributeRule(
             const DOMElement* e, const FilterPolicyContext& permMap, const FilterPolicyContext& denyMap, bool standalone
             );
 
         Category& m_log;
         DOMDocument* m_document;
         vector<Policy> m_policies;
-        map< string,tuple<string,const MatchFunctor*,const MatchFunctor*> > m_attrRules;
+        map< string,boost::tuple<string,const MatchFunctor*,const MatchFunctor*> > m_attrRules;
         multimap<string,MatchFunctor*> m_policyReqRules;
         multimap<string,MatchFunctor*> m_permitValRules;
         multimap<string,MatchFunctor*> m_denyValRules;
@@ -194,14 +194,14 @@
                 e = XMLHelper::getNextSiblingElement(e);
                 while (e) {
                     if (e && XMLHelper::isNodeNamed(e, SHIB2ATTRIBUTEFILTER_NS, AttributeRule)) {
-                        tuple<string,const MatchFunctor*,const MatchFunctor*> rule = buildAttributeRule(e, permFunctors, denyFunctors, false);
+                        boost::tuple<string,const MatchFunctor*,const MatchFunctor*> rule = buildAttributeRule(e, permFunctors, denyFunctors, false);
                         if (rule.get<1>() || rule.get<2>())
                             m_policies.back().m_rules.insert(Policy::rules_t::value_type(rule.get<0>(), make_pair(rule.get<1>(), rule.get<2>())));
                     }
                     else if (e && XMLHelper::isNodeNamed(e, SHIB2ATTRIBUTEFILTER_NS, AttributeRuleReference)) {
                         string ref(XMLHelper::getAttrString(e, nullptr, _ref));
                         if (!ref.empty()) {
-                            map< string,tuple<string,const MatchFunctor*,const MatchFunctor*> >::const_iterator ar = m_attrRules.find(ref);
+                            map< string,boost::tuple<string,const MatchFunctor*,const MatchFunctor*> >::const_iterator ar = m_attrRules.find(ref);
                             if (ar != m_attrRules.end()) {
                                 m_policies.back().m_rules.insert(
                                     Policy::rules_t::value_type(ar->second.get<0>(), make_pair(ar->second.get<1>(), ar->second.get<2>()))
@@ -261,7 +261,7 @@
     return nullptr;
 }
 
-tuple<string,const MatchFunctor*,const MatchFunctor*> XMLFilterImpl::buildAttributeRule(

[... 192 lines stripped ...]