From a0d95c41eeee58fa92479aa8be851375e8cfa34b Mon Sep 17 00:00:00 2001
From: Scott Cantor <cantor.2@osu.edu>
Date: Fri, 23 Jan 2015 01:18:24 +0000
Subject: [PATCH] SSPCPP-616 - fix tuple ambiguity

---
 shibsp/handler/impl/TransformSessionInitiator.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/shibsp/handler/impl/TransformSessionInitiator.cpp b/shibsp/handler/impl/TransformSessionInitiator.cpp
index 02e6dc4..be1d322 100644
--- a/shibsp/handler/impl/TransformSessionInitiator.cpp
+++ b/shibsp/handler/impl/TransformSessionInitiator.cpp
@@ -109,7 +109,7 @@ namespace shibsp {
                             auto_ptr_char m(e->getAttributeNS(nullptr, match));
                             auto_ptr_char repl(e->getTextContent());
                             if (m.get() && *m.get() && repl.get() && *repl.get())
-                                m_regex.push_back(tuple<bool,string,string>(flag, m.get(), repl.get()));
+                                m_regex.push_back(boost::tuple<bool,string,string>(flag, m.get(), repl.get()));
                         }
                         else {
                             m_log.warn("Unknown element found in Transform SessionInitiator configuration, check for errors.");
@@ -133,7 +133,7 @@ namespace shibsp {
 #ifndef SHIBSP_LITE
         bool m_alwaysRun;
         vector< pair<bool, string> > m_subst;
-        vector< tuple<bool,string,string> > m_regex;
+        vector< boost::tuple<bool,string,string> > m_regex;
 #endif
     };
 
@@ -254,7 +254,7 @@ void TransformSessionInitiator::doRequest(const Application& application, string
     }
 
     // Now try regexs.
-    for (vector< tuple<bool,string,string> >::const_iterator r = m_regex.begin(); r != m_regex.end(); ++r) {
+    for (vector< boost::tuple<bool,string,string> >::const_iterator r = m_regex.begin(); r != m_regex.end(); ++r) {
         try {
             RegularExpression exp(r->get<1>().c_str());
             XMLCh* temp = exp.replace(entityID.c_str(), r->get<2>().c_str());
-- 
2.1.4