changed auto_ptr to shared_ptr

Signed-off-by: Michael Krelin <hacker@klever.net>

4 files changed, 10 insertions, 10 deletions

diff --git a/include/Makefile.am b/include/Makefile.am
index 078c6dc..26cb614 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -12,7 +12,8 @@ nobase_include_HEADERS = \
 	opkele/xconsumer.h \
 	opkele/xserver.h \
 	opkele/discovery.h \
-	opkele/uris.h
+	opkele/uris.h \
+	opkele/tr1-mem.h
 EXTRA_DIST = \
 	opkele/data.h \
 	opkele/curl.h opkele/expat.h \
diff --git a/include/opkele/consumer.h b/include/opkele/consumer.h
index c463787..3c1d318 100644
--- a/include/opkele/consumer.h
+++ b/include/opkele/consumer.h
@@ -31,7 +31,7 @@ namespace opkele {
 	     * @param handle association handle
 	     * @param secret the secret associated with the server and handle
 	     * @param expires_in the number of seconds until the handle is expired
-	     * @return the auto_ptr<> for the newly allocated association_t object
+	     * @return the assoc_t for the newly allocated association_t object
 	     */
 	    virtual assoc_t store_assoc(const string& server,const string& handle,const secret_t& secret,int expires_in) = 0;
 	    /**
@@ -73,7 +73,7 @@ namespace opkele {
 	     * middle of negotiations.
 	     *
 	     * @param server the OpenID server
-	     * @return the auto_ptr<> for the newly allocated association_t object
+	     * @return the assoc_t for the newly allocated association_t object
 	     * @throw failed_lookup in case of absence of the handle
 	     */
 	    virtual assoc_t find_assoc(const string& server);
@@ -93,7 +93,7 @@ namespace opkele {
 	    /**
 	     * perform the associate request to OpenID server.
 	     * @param server the OpenID server
-	     * @return the auto_ptr<> for the newly allocated association_t
+	     * @return the assoc_t for the newly allocated association_t
 	     * object, representing established association
 	     * @throw exception in case of error
 	     */
diff --git a/include/opkele/server.h b/include/opkele/server.h
index dd7fc41..3c25646 100644
--- a/include/opkele/server.h
+++ b/include/opkele/server.h
@@ -25,7 +25,7 @@ namespace opkele {
 	     * store.
 	     * @param mode the mode of request being processed to base the
 	     * statelessness of the association upon
-	     * @return the auto_ptr<> for the newly allocated association_t object
+	     * @return the assoc_t for the newly allocated association_t object
 	     */
 	    virtual assoc_t alloc_assoc(mode_t mode) = 0;
 	    /**
@@ -33,7 +33,7 @@ namespace opkele {
 	     * the reqal implementation to provide persistent assocations
 	     * store.
 	     * @param h association handle
-	     * @return the auto_ptr<> for the newly allocated association_t object
+	     * @return the assoc_t for the newly allocated association_t object
 	     * @throw failed_lookup in case of failure
 	     */
 	    virtual assoc_t retrieve_assoc(const string& h) = 0;
diff --git a/include/opkele/types.h b/include/opkele/types.h
index ca07df5..d959021 100644
--- a/include/opkele/types.h
+++ b/include/opkele/types.h
@@ -10,15 +10,14 @@
 #include <vector>
 #include <string>
 #include <map>
-#include <memory>
 #include <set>
+#include <opkele/tr1-mem.h>
 
 namespace opkele {
     using std::vector;
     using std::string;
     using std::map;
     using std::ostream;
-    using std::auto_ptr;
     using std::multimap;
     using std::set;
 
@@ -108,9 +107,9 @@ namespace opkele {
     };
 
     /**
-     * the auto_ptr<> for association_t object type
+     * the shared_ptr<> for association_t object type
      */
-    typedef auto_ptr<association_t> assoc_t;
+    typedef tr1mem::shared_ptr<association_t> assoc_t;
 
     /**
      * request/response parameters map