From 0fdf19714613a82a184f4f6e75fb9a4f9b62f18a Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Sun, 19 Jan 2014 10:05:08 +0200
Subject: Use std::unique_ptr instead of std::auto_ptr in C++11 mode

---
 libxsd/xsd/cxx/tree/containers.txx | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

(limited to 'libxsd/xsd/cxx/tree/containers.txx')

diff --git a/libxsd/xsd/cxx/tree/containers.txx b/libxsd/xsd/cxx/tree/containers.txx
index a27af48..7e45a02 100644
--- a/libxsd/xsd/cxx/tree/containers.txx
+++ b/libxsd/xsd/cxx/tree/containers.txx
@@ -4,6 +4,11 @@
 // license   : GNU GPL v2 + exceptions; see accompanying LICENSE file
 
 #include <ostream>
+
+#ifdef XSD_CXX11
+#  include <utility> // std::move
+#endif
+
 #include <xsd/cxx/tree/bits/literals.hxx>
 
 namespace xsd
@@ -38,10 +43,14 @@ namespace xsd
 
       template<typename T>
       one<T, false>::
-      one (std::auto_ptr<T> x, container* c)
+      one (XSD_AUTO_PTR<T> x, container* c)
           : x_ (0), container_ (c)
       {
+#ifdef XSD_CXX11
+        set (std::move (x));
+#else
         set (x);
+#endif
       }
 
       template<typename T>
@@ -86,7 +95,7 @@ namespace xsd
 
       template<typename T>
       void one<T, false>::
-      set (std::auto_ptr<T> x)
+      set (XSD_AUTO_PTR<T> x)
       {
         T* r (0);
 
@@ -128,10 +137,14 @@ namespace xsd
 
       template <typename T>
       optional<T, false>::
-      optional (std::auto_ptr<T> x, container* c)
+      optional (XSD_AUTO_PTR<T> x, container* c)
           : x_ (0), container_ (c)
       {
+#ifdef XSD_CXX11
+        set (std::move (x));
+#else
         set (x);
+#endif
       }
 
       template <typename T>
@@ -185,7 +198,7 @@ namespace xsd
 
       template <typename T>
       void optional<T, false>::
-      set (std::auto_ptr<T> x)
+      set (XSD_AUTO_PTR<T> x)
       {
         T* r (0);
 
-- 
cgit v1.1