[cpp-opensaml] branch master updated: CPPXT-130 - auto_ptr cleanup

[Scott Cantor]

This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to branch master
in repository cpp-opensaml.

View the commit online:
http://git.shibboleth.net/view/?p=cpp-opensaml.git;a=commit;h=3859971dc9acafcfd40eaab21ee0bb021540ff70

The following commit(s) were added to refs/heads/master by this push:
       new  3859971   CPPXT-130 - auto_ptr cleanup
3859971 is described below

commit 3859971dc9acafcfd40eaab21ee0bb021540ff70
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Fri Apr 6 17:10:45 2018 -0400

    CPPXT-130 - auto_ptr cleanup
    
    https://issues.shibboleth.net/jira/browse/CPPXT-130
---
 saml/binding/ArtifactMap.h                            | 4 ++--
 saml/binding/impl/ArtifactMap.cpp                     | 2 +-
 saml/saml2/metadata/AbstractDynamicMetadataProvider.h | 2 +-
 saml/saml2/metadata/AbstractMetadataProvider.h        | 4 ++--
 saml/saml2/metadata/ObservableMetadataProvider.h      | 2 +-
 saml/saml2/metadata/impl/ChainingMetadataProvider.cpp | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/saml/binding/ArtifactMap.h b/saml/binding/ArtifactMap.h
index 6c7465c..a3d5d1b 100644
--- a/saml/binding/ArtifactMap.h
+++ b/saml/binding/ArtifactMap.h
@@ -30,7 +30,7 @@
 #include <saml/base.h>
 
 #include <string>
-#include <memory>
+#include <boost/scoped_ptr.hpp>
 #include <xercesc/dom/DOM.hpp>
 
 namespace xmltooling {
@@ -111,7 +111,7 @@ namespace opensaml {
     private:
         xmltooling::StorageService* m_storage;
         std::string m_context;
-        std::auto_ptr<ArtifactMappings> m_mappings;
+        boost::scoped_ptr<ArtifactMappings> m_mappings;
         unsigned int m_artifactTTL;
     };
 
diff --git a/saml/binding/impl/ArtifactMap.cpp b/saml/binding/impl/ArtifactMap.cpp
index e4bae0e..6746318 100644
--- a/saml/binding/impl/ArtifactMap.cpp
+++ b/saml/binding/impl/ArtifactMap.cpp
@@ -75,7 +75,7 @@ namespace opensaml {
 
         void removeMapping(const map<string,Mapping>::iterator& i);
         
-        auto_ptr<Mutex> m_lock;
+        scoped_ptr<Mutex> m_lock;
         map<string,Mapping> m_artMap;
         multimap<time_t,string> m_expMap;
     };
diff --git a/saml/saml2/metadata/AbstractDynamicMetadataProvider.h b/saml/saml2/metadata/AbstractDynamicMetadataProvider.h
index e4e0dab..30b0c86 100644
--- a/saml/saml2/metadata/AbstractDynamicMetadataProvider.h
+++ b/saml/saml2/metadata/AbstractDynamicMetadataProvider.h
@@ -94,7 +94,7 @@ namespace opensaml {
 
         private:
             std::string m_id;
-            std::auto_ptr<xmltooling::RWLock> m_lock;
+            boost::scoped_ptr<xmltooling::RWLock> m_lock;
             double m_refreshDelayFactor;
             time_t m_minCacheDuration, m_maxCacheDuration;
             typedef std::map<xmltooling::xstring,time_t> cachemap_t;
diff --git a/saml/saml2/metadata/AbstractMetadataProvider.h b/saml/saml2/metadata/AbstractMetadataProvider.h
index d865435..bb602f1 100644
--- a/saml/saml2/metadata/AbstractMetadataProvider.h
+++ b/saml/saml2/metadata/AbstractMetadataProvider.h
@@ -141,8 +141,8 @@ namespace opensaml {
             mutable sitemap_t m_sources;
             mutable groupmap_t m_groups;
 
-            std::auto_ptr<xmltooling::KeyInfoResolver> m_resolverWrapper;
-            mutable std::auto_ptr<xmltooling::Mutex> m_credentialLock;
+            boost::scoped_ptr<xmltooling::KeyInfoResolver> m_resolverWrapper;
+            boost::scoped_ptr<xmltooling::Mutex> m_credentialLock;
             typedef std::map< const RoleDescriptor*, std::vector<xmltooling::Credential*> > credmap_t;
             mutable credmap_t m_credentialMap;
             const credmap_t::mapped_type& resolveCredentials(const RoleDescriptor& role) const;
diff --git a/saml/saml2/metadata/ObservableMetadataProvider.h b/saml/saml2/metadata/ObservableMetadataProvider.h
index fab712b..02cb89a 100644
--- a/saml/saml2/metadata/ObservableMetadataProvider.h
+++ b/saml/saml2/metadata/ObservableMetadataProvider.h
@@ -111,7 +111,7 @@ namespace opensaml {
             virtual const Observer* removeObserver(const Observer* oldObserver) const;
 
         private:
-            mutable std::auto_ptr<xmltooling::Mutex> m_observerLock;
+            boost::scoped_ptr<xmltooling::Mutex> m_observerLock;
             mutable std::vector<const Observer*> m_observers;
         };
 
diff --git a/saml/saml2/metadata/impl/ChainingMetadataProvider.cpp b/saml/saml2/metadata/impl/ChainingMetadataProvider.cpp
index 9668ffa..0cbaf8e 100644
--- a/saml/saml2/metadata/impl/ChainingMetadataProvider.cpp
+++ b/saml/saml2/metadata/impl/ChainingMetadataProvider.cpp
@@ -124,7 +124,7 @@ namespace opensaml {
 
         private:
             bool m_firstMatch;
-            mutable auto_ptr<Mutex> m_trackerLock;
+            scoped_ptr<Mutex> m_trackerLock;
             auto_ptr<ThreadKey> m_tlsKey;
             mutable ptr_vector<MetadataProvider> m_providers;
             mutable set<tracker_t*> m_trackers;

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.