From 0e4faabf051eac1a96a5dd367af7b5e1fe40d778 Mon Sep 17 00:00:00 2001 From: Scott Cantor Date: Fri, 19 Nov 2010 18:27:39 +0000 Subject: [PATCH] Fix Solaris errors. --- shibsp/impl/XMLServiceProvider.cpp | 38 +++++++++++++++++++++++++------------- 1 file changed, 25 insertions(+), 13 deletions(-) diff --git a/shibsp/impl/XMLServiceProvider.cpp b/shibsp/impl/XMLServiceProvider.cpp index 1c1d9f4..51e90c1 100644 --- a/shibsp/impl/XMLServiceProvider.cpp +++ b/shibsp/impl/XMLServiceProvider.cpp @@ -883,7 +883,7 @@ void XMLApplication::doHandlers(const ProtocolProvider* pp, const DOMElement* e, child = XMLHelper::getNextSiblingElement(child); continue; } - handler = conf.AssertionConsumerServiceManager.newPlugin(bindprop.c_str(), make_pair(child, getId())); + handler = conf.AssertionConsumerServiceManager.newPlugin(bindprop.c_str(), pair(child, getId())); // Map by binding and protocol (may be > 1 per protocol and binding) m_acsBindingMap[handler->getXMLString("Binding").second].push_back(handler); const XMLCh* protfamily = handler->getProtocolFamily(); @@ -910,7 +910,7 @@ void XMLApplication::doHandlers(const ProtocolProvider* pp, const DOMElement* e, child = XMLHelper::getNextSiblingElement(child); continue; } - SessionInitiator* sihandler = conf.SessionInitiatorManager.newPlugin(t.c_str(), make_pair(child, getId())); + SessionInitiator* sihandler = conf.SessionInitiatorManager.newPlugin(t.c_str(), pair(child, getId())); handler = sihandler; pair si_id = handler->getString("id"); if (si_id.first && si_id.second) @@ -935,7 +935,7 @@ void XMLApplication::doHandlers(const ProtocolProvider* pp, const DOMElement* e, child = XMLHelper::getNextSiblingElement(child); continue; } - handler = conf.LogoutInitiatorManager.newPlugin(t.c_str(), make_pair(child, getId())); + handler = conf.LogoutInitiatorManager.newPlugin(t.c_str(), pair(child, getId())); } else if (XMLString::equals(child->getLocalName(), _ArtifactResolutionService)) { string bindprop(XMLHelper::getAttrString(child, nullptr, Binding)); @@ -944,7 +944,7 @@ void XMLApplication::doHandlers(const ProtocolProvider* pp, const DOMElement* e, child = XMLHelper::getNextSiblingElement(child); continue; } - handler = conf.ArtifactResolutionServiceManager.newPlugin(bindprop.c_str(), make_pair(child, getId())); + handler = conf.ArtifactResolutionServiceManager.newPlugin(bindprop.c_str(), pair(child, getId())); if (!hardArt) { pair defprop = handler->getBool("isDefault"); @@ -965,7 +965,7 @@ void XMLApplication::doHandlers(const ProtocolProvider* pp, const DOMElement* e, child = XMLHelper::getNextSiblingElement(child); continue; } - handler = conf.SingleLogoutServiceManager.newPlugin(bindprop.c_str(), make_pair(child, getId())); + handler = conf.SingleLogoutServiceManager.newPlugin(bindprop.c_str(), pair(child, getId())); } else if (XMLString::equals(child->getLocalName(), _ManageNameIDService)) { string bindprop(XMLHelper::getAttrString(child, nullptr, Binding)); @@ -974,7 +974,7 @@ void XMLApplication::doHandlers(const ProtocolProvider* pp, const DOMElement* e, child = XMLHelper::getNextSiblingElement(child); continue; } - handler = conf.ManageNameIDServiceManager.newPlugin(bindprop.c_str(), make_pair(child, getId())); + handler = conf.ManageNameIDServiceManager.newPlugin(bindprop.c_str(), pair(child, getId())); } else { string t(XMLHelper::getAttrString(child, nullptr, _type)); @@ -983,7 +983,7 @@ void XMLApplication::doHandlers(const ProtocolProvider* pp, const DOMElement* e, child = XMLHelper::getNextSiblingElement(child); continue; } - handler = conf.HandlerManager.newPlugin(t.c_str(), make_pair(child, getId())); + handler = conf.HandlerManager.newPlugin(t.c_str(), pair(child, getId())); } m_handlers.push_back(handler); @@ -1055,7 +1055,9 @@ void XMLApplication::doSSO(const ProtocolProvider& pp, set& protocols, D acsdom->setAttributeNS(nullptr, _index, indexbuf.c_str()); log.info("adding AssertionConsumerService for Binding (%s) at (%s)", (*b)->getString("id").second, (*b)->getString("path").second); - Handler* handler = conf.AssertionConsumerServiceManager.newPlugin((*b)->getString("id").second, make_pair(acsdom, getId())); + Handler* handler = conf.AssertionConsumerServiceManager.newPlugin( + (*b)->getString("id").second, pair(acsdom, getId()) + ); m_handlers.push_back(handler); // Setup maps and defaults. @@ -1113,7 +1115,9 @@ void XMLApplication::doSSO(const ProtocolProvider& pp, set& protocols, D e->setAttributeNS(nullptr, Location, _loc); // Instantiate Chaining initiator around the SSO element. - SessionInitiator* chain = conf.SessionInitiatorManager.newPlugin(CHAINING_SESSION_INITIATOR, make_pair(e, getId())); + SessionInitiator* chain = conf.SessionInitiatorManager.newPlugin( + CHAINING_SESSION_INITIATOR, pair(e, getId()) + ); m_handlers.push_back(chain); m_sessionInitDefault = chain; m_handlerMap["/Login"] = chain; @@ -1168,7 +1172,9 @@ void XMLApplication::doLogout(const ProtocolProvider& pp, set& protocols slodom->setAttributeNS(nullptr, Location, pathprop.second); log.info("adding SingleLogoutService for Binding (%s) at (%s)", (*b)->getString("id").second, (*b)->getString("path").second); - Handler* handler = conf.SingleLogoutServiceManager.newPlugin((*b)->getString("id").second, make_pair(slodom, getId())); + Handler* handler = conf.SingleLogoutServiceManager.newPlugin( + (*b)->getString("id").second, pair(slodom, getId()) + ); m_handlers.push_back(handler); // Insert into location map. @@ -1199,7 +1205,9 @@ void XMLApplication::doLogout(const ProtocolProvider& pp, set& protocols e->setAttributeNS(nullptr, Location, _loc); // Instantiate Chaining initiator around the SSO element. - Handler* chain = conf.LogoutInitiatorManager.newPlugin(CHAINING_LOGOUT_INITIATOR, make_pair(e, getId())); + Handler* chain = conf.LogoutInitiatorManager.newPlugin( + CHAINING_LOGOUT_INITIATOR, pair(e, getId()) + ); m_handlers.push_back(chain); m_handlerMap["/Logout"] = chain; } @@ -1231,7 +1239,9 @@ void XMLApplication::doNameIDMgmt(const ProtocolProvider& pp, set& proto nimdom->setAttributeNS(nullptr, Location, pathprop.second); log.info("adding ManageNameIDService for Binding (%s) at (%s)", (*b)->getString("id").second, (*b)->getString("path").second); - Handler* handler = conf.ManageNameIDServiceManager.newPlugin((*b)->getString("id").second, make_pair(nimdom, getId())); + Handler* handler = conf.ManageNameIDServiceManager.newPlugin( + (*b)->getString("id").second, pair(nimdom, getId()) + ); m_handlers.push_back(handler); // Insert into location map. @@ -1280,7 +1290,9 @@ void XMLApplication::doArtifactResolution(const ProtocolProvider& pp, const char artdom->setAttributeNS(nullptr, _index, indexbuf.c_str()); log.info("adding ArtifactResolutionService for Binding (%s) at (%s)", (*b)->getString("id").second, (*b)->getString("path").second); - Handler* handler = conf.ArtifactResolutionServiceManager.newPlugin((*b)->getString("id").second, make_pair(artdom, getId())); + Handler* handler = conf.ArtifactResolutionServiceManager.newPlugin( + (*b)->getString("id").second, pair(artdom, getId()) + ); m_handlers.push_back(handler); if (!m_artifactResolutionDefault) -- 2.1.4