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

[shibboleth/cpp-opensaml.git] / saml / binding / ArtifactMap.h

diff --git a/saml/binding/ArtifactMap.h b/saml/binding/ArtifactMap.h
index 8a84ee5..37e6e22 100644 (file)
--- a/saml/binding/ArtifactMap.h
+++ b/saml/binding/ArtifactMap.h
@@ -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.
@@ -49,19 +49,19 @@ namespace opensaml {
         /**
          * Creates a map on top of a particular storage service context, or in-memory.
          * 
-         * @param storage       pointer to a StorageService, or NULL to keep map in memory
+         * @param storage       pointer to a StorageService, or nullptr to keep map in memory
          * @param context       optional label for storage context
          * @param artifactTTL   time to live in seconds, determines how long artifact remains valid
          */
-        ArtifactMap(xmltooling::StorageService* storage=NULL, const char* context=NULL, unsigned int artifactTTL=180);
+        ArtifactMap(xmltooling::StorageService* storage=nullptr, const char* context=nullptr, unsigned int artifactTTL=180);
 
         /**
          * Creates a map on top of a particular storage service context, or in-memory.
          * 
          * @param e         root of a DOM with optional XML attributes for context and artifactTTL
-         * @param storage   pointer to a StorageService, or NULL to keep map in memory
+         * @param storage   pointer to a StorageService, or nullptr to keep map in memory
          */
-        ArtifactMap(const xercesc::DOMElement* e, xmltooling::StorageService* storage=NULL);
+        ArtifactMap(const xercesc::DOMElement* e, xmltooling::StorageService* storage=nullptr);
 
         virtual ~ArtifactMap();
         
@@ -76,7 +76,7 @@ namespace opensaml {
          * @param relyingParty  entityID of the party authorized to resolve the artifact
          * @return the generated artifact
          */
-        virtual void storeContent(xmltooling::XMLObject* content, const SAMLArtifact* artifact, const char* relyingParty=NULL);
+        virtual void storeContent(xmltooling::XMLObject* content, const SAMLArtifact* artifact, const char* relyingParty=nullptr);
         
         /**
          * Retrieves the XML content represented by the artifact. The identity of the
@@ -88,7 +88,7 @@ namespace opensaml {
          * @param relyingParty  entityID of the party trying to resolve the artifact
          * @return the XML content
          */
-        virtual xmltooling::XMLObject* retrieveContent(const SAMLArtifact* artifact, const char* relyingParty=NULL);
+        virtual xmltooling::XMLObject* retrieveContent(const SAMLArtifact* artifact, const char* relyingParty=nullptr);
 
         /**
          * Retrieves the relying party to whom the artifact was issued.