From: Scott Cantor <cantor.2@osu.edu>
Date: Sat, 23 Oct 2010 22:46:37 +0000 (+0000)
Subject: Avoid use of nullptr.
X-Git-Tag: 1.0.0~31
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=shibboleth%2Fcpp-sp-resolver.git;a=commitdiff_plain;h=5a0fc1ebe1822cf26614f503577696cd81afb3d9

Avoid use of nullptr.
---

diff --git a/shibresolver/resolver.cpp b/shibresolver/resolver.cpp
index 7fefb44..a328f1d 100644
--- a/shibresolver/resolver.cpp
+++ b/shibresolver/resolver.cpp
@@ -278,7 +278,7 @@ void RemotedResolver::resolve(
 {
 #ifndef SHIBSP_LITE
     Category& log = Category::getInstance(SHIBRESOLVER_LOGCAT);
-    pair<const EntityDescriptor*,const RoleDescriptor*> entity = pair<const EntityDescriptor*,const RoleDescriptor*>(nullptr,nullptr);
+    pair<const EntityDescriptor*,const RoleDescriptor*> entity = pair<const EntityDescriptor*,const RoleDescriptor*>(NULL,NULL);
     MetadataProvider* m = app.getMetadataProvider();
     Locker locker(m);
     if (issuer && *issuer) {
@@ -303,8 +303,8 @@ void RemotedResolver::resolve(
             if (mprefix.first) {
                 log.debug("extracting metadata-derived attributes...");
                 try {
-                    // We pass nullptr for "issuer" because the IdP isn't the one asserting metadata-based attributes.
-                    extractor->extractAttributes(app, nullptr, *entity.second, resolvedAttrs);
+                    // We pass NULL for "issuer" because the IdP isn't the one asserting metadata-based attributes.
+                    extractor->extractAttributes(app, NULL, *entity.second, resolvedAttrs);
                     for (vector<Attribute*>::iterator a = resolvedAttrs.begin(); a != resolvedAttrs.end(); ++a) {
                         vector<string>& ids = (*a)->getAliases();
                         for (vector<string>::iterator id = ids.begin(); id != ids.end(); ++id)
@@ -363,9 +363,9 @@ void RemotedResolver::resolve(
                     app,
                     entity.first,
                     samlconstants::SAML20P_NS,
-                    nullptr,
-                    nullptr,
-                    nullptr,
+                    NULL,
+                    NULL,
+                    NULL,
                     &assertions,
                     &inputs
                     )