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

[shibboleth/cpp-opensaml.git] / saml / saml2 / metadata / DynamicMetadataProvider.h

diff --git a/saml/saml2/metadata/DynamicMetadataProvider.h b/saml/saml2/metadata/DynamicMetadataProvider.h
index fe3d051..389f461 100644 (file)
--- a/saml/saml2/metadata/DynamicMetadataProvider.h
+++ b/saml/saml2/metadata/DynamicMetadataProvider.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.
@@ -43,7 +43,7 @@ namespace opensaml {
              *
              * @param e DOM to supply configuration for provider
              */
-            DynamicMetadataProvider(const xercesc::DOMElement* e=NULL);
+            DynamicMetadataProvider(const xercesc::DOMElement* e=nullptr);
 
             virtual ~DynamicMetadataProvider();
 
@@ -60,8 +60,6 @@ namespace opensaml {
             /** Caps the allowable cache duration of a metadata instance. */
             time_t m_maxCacheDuration;
 
-            using AbstractMetadataProvider::resolve;
-
             /**
              * Resolves a metadata instance using the supplied criteria.
              *
@@ -72,6 +70,8 @@ namespace opensaml {
 
         private:
             mutable xmltooling::RWLock* m_lock;
+            typedef std::map<xmltooling::xstring,time_t> cachemap_t;
+            mutable cachemap_t m_cacheMap;
         };
 
     };