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
@@ -14,3 +14,4 @@ nobase_include_HEADERS = \
         opkele/discovery.h \
-        opkele/uris.h
+        opkele/uris.h \
+        opkele/tr1-mem.h
 EXTRA_DIST = \
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
@@ -33,3 +33,3 @@ namespace opkele {
              * @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
              */
@@ -75,3 +75,3 @@ namespace opkele {
              * @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
@@ -95,3 +95,3 @@ namespace opkele {
              * @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
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
@@ -27,3 +27,3 @@ namespace opkele {
              * 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
              */
@@ -35,3 +35,3 @@ namespace opkele {
              * @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
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
@@ -12,4 +12,4 @@
 #include <map>
-#include <memory>
 #include <set>
+#include <opkele/tr1-mem.h>
 
@@ -20,3 +20,2 @@ namespace opkele {
     using std::ostream;
-    using std::auto_ptr;
     using std::multimap;
@@ -110,5 +109,5 @@ 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;