Convert from NULL macro to nullptr, remove unused zlib code.

[shibboleth/cpp-opensaml.git] / saml / saml2 / metadata / impl / MetadataProvider.cpp

diff --git a/saml/saml2/metadata/impl/MetadataProvider.cpp b/saml/saml2/metadata/impl/MetadataProvider.cpp
index 4d8d6b1..ae4d758 100644 (file)
--- a/saml/saml2/metadata/impl/MetadataProvider.cpp
+++ b/saml/saml2/metadata/impl/MetadataProvider.cpp
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2001-2009 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.
@@ -89,10 +89,10 @@ MetadataProvider::MetadataProvider(const DOMElement* e)
 
     // Locate any default recognized filters and plugins.
     try {
-        DOMElement* child = e ? XMLHelper::getFirstChildElement(e) : NULL;
+        DOMElement* child = e ? XMLHelper::getFirstChildElement(e) : nullptr;
         while (child) {
             if (XMLString::equals(child->getLocalName(),_MetadataFilter)) {
-                auto_ptr_char t(child->getAttributeNS(NULL,type));
+                auto_ptr_char t(child->getAttributeNS(nullptr,type));
                 if (t.get() && *t.get()) {
                     log.info("building MetadataFilter of type %s", t.get());
                     m_filters.push_back(conf.MetadataFilterManager.newPlugin(t.get(),child));
@@ -146,7 +146,7 @@ MetadataFilter* MetadataProvider::removeMetadataFilter(MetadataFilter* oldFilter
             return oldFilter;
         }
     }
-    return NULL;
+    return nullptr;
 }
 
 void MetadataProvider::doFilters(XMLObject& xmlObject) const
@@ -168,22 +168,22 @@ const EntitiesDescriptor* MetadataProvider::getEntitiesDescriptor(const XMLCh* n
 }
 
 MetadataProvider::Criteria::Criteria()
-    : entityID_unicode(NULL), entityID_ascii(NULL), artifact(NULL), role(NULL), protocol(NULL), protocol2(NULL), validOnly(true)
+    : entityID_unicode(nullptr), entityID_ascii(nullptr), artifact(nullptr), role(nullptr), protocol(nullptr), protocol2(nullptr), validOnly(true)
 {
 }
 
 MetadataProvider::Criteria::Criteria(const XMLCh* id, const xmltooling::QName* q, const XMLCh* prot, bool valid)
-    : entityID_unicode(id), entityID_ascii(NULL), artifact(NULL), role(q), protocol(prot), protocol2(NULL), validOnly(valid)
+    : entityID_unicode(id), entityID_ascii(nullptr), artifact(nullptr), role(q), protocol(prot), protocol2(nullptr), validOnly(valid)
 {
 }
 
 MetadataProvider::Criteria::Criteria(const char* id, const xmltooling::QName* q, const XMLCh* prot, bool valid)
-    : entityID_unicode(NULL), entityID_ascii(id), artifact(NULL), role(q), protocol(prot), protocol2(NULL), validOnly(valid)
+    : entityID_unicode(nullptr), entityID_ascii(id), artifact(nullptr), role(q), protocol(prot), protocol2(nullptr), validOnly(valid)
 {
 }
 
 MetadataProvider::Criteria::Criteria(const SAMLArtifact* a, const xmltooling::QName* q, const XMLCh* prot, bool valid)
-    : entityID_unicode(NULL), entityID_ascii(NULL), artifact(a), role(q), protocol(prot), protocol2(NULL), validOnly(valid)
+    : entityID_unicode(nullptr), entityID_ascii(nullptr), artifact(a), role(q), protocol(prot), protocol2(nullptr), validOnly(valid)
 {
 }
 
@@ -193,12 +193,12 @@ MetadataProvider::Criteria::~Criteria()
 
 void MetadataProvider::Criteria::reset()
 {
-    entityID_unicode=NULL;
-    entityID_ascii=NULL;
-    artifact=NULL;
-    role=NULL;
-    protocol=NULL;
-    protocol2=NULL;
+    entityID_unicode=nullptr;
+    entityID_ascii=nullptr;
+    artifact=nullptr;
+    role=nullptr;
+    protocol=nullptr;
+    protocol2=nullptr;
     validOnly=true;
 }