X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=xmltooling%2Fsecurity%2Fimpl%2FChainingCredentialResolver.cpp;h=eefbc299c62117c4e0961b614e69e90a048e3168;hb=a0d768778a8f5f539b909baf5b115e70ea765f0f;hp=abbe6b2e8299ca55e8981962e2b3d4f8ca557316;hpb=a5e86d37cf40004e6a43a21ab67d26695fa8619c;p=shibboleth%2Fcpp-xmltooling.git

diff --git a/xmltooling/security/impl/ChainingCredentialResolver.cpp b/xmltooling/security/impl/ChainingCredentialResolver.cpp
index abbe6b2..eefbc29 100644
--- a/xmltooling/security/impl/ChainingCredentialResolver.cpp
+++ b/xmltooling/security/impl/ChainingCredentialResolver.cpp
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2001-2007 Internet2
+ *  Copyright 2001-2010 Internet2
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,6 +27,7 @@
 #include "util/NDC.h"
 #include "util/XMLHelper.h"
 
+#include <algorithm>
 #include <xercesc/util/XMLUniDefs.hpp>
 
 using namespace xmltooling::logging;
@@ -52,15 +53,15 @@ namespace xmltooling {
             for_each(m_resolvers.begin(), m_resolvers.end(), mem_fun(&Lockable::unlock));
         }
         
-        const Credential* resolve(const CredentialCriteria* criteria=NULL) const {
-            const Credential* cred = NULL;
+        const Credential* resolve(const CredentialCriteria* criteria=nullptr) const {
+            const Credential* cred = nullptr;
             for (vector<CredentialResolver*>::const_iterator cr = m_resolvers.begin(); !cred && cr!=m_resolvers.end(); ++cr)
                 cred = (*cr)->resolve(criteria);
             return cred;
         }
 
         virtual vector<const Credential*>::size_type resolve(
-            vector<const Credential*>& results, const CredentialCriteria* criteria=NULL
+            vector<const Credential*>& results, const CredentialCriteria* criteria=nullptr
             ) const {
             for (vector<CredentialResolver*>::const_iterator cr = m_resolvers.begin(); cr!=m_resolvers.end(); ++cr)
                 (*cr)->resolve(results, criteria);
@@ -86,9 +87,9 @@ ChainingCredentialResolver::ChainingCredentialResolver(const DOMElement* e)
     Category& log=Category::getInstance(XMLTOOLING_LOGCAT".CredentialResolver."CHAINING_CREDENTIAL_RESOLVER);
 
     // Load up the chain of resolvers.
-    e = e ? XMLHelper::getFirstChildElement(e, _CredentialResolver) : NULL;
+    e = e ? XMLHelper::getFirstChildElement(e, _CredentialResolver) : nullptr;
     while (e) {
-        auto_ptr_char type(e->getAttributeNS(NULL,_type));
+        auto_ptr_char type(e->getAttributeNS(nullptr,_type));
         if (type.get() && *(type.get())) {
             log.info("building CredentialResolver of type %s", type.get());
             try {