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

---
 xsd/cxx/tree/stream-extraction-source.cxx | 39 +++++++++++++++++--------------
 1 file changed, 21 insertions(+), 18 deletions(-)

(limited to 'xsd/cxx/tree/stream-extraction-source.cxx')

diff --git a/xsd/cxx/tree/stream-extraction-source.cxx b/xsd/cxx/tree/stream-extraction-source.cxx
index 4704fb3..05e47b5 100644
--- a/xsd/cxx/tree/stream-extraction-source.cxx
+++ b/xsd/cxx/tree/stream-extraction-source.cxx
@@ -337,6 +337,11 @@ namespace CXX
           //
           bool poly (polymorphic && polymorphic_p (t) && !anonymous_p (t));
 
+          char const* r (
+            (poly || !fund) && std >= cxx_version::cxx11
+            ? "::std::move (r)"
+            : "r");
+
           if (max (e) != 1)
           {
             // sequence
@@ -358,14 +363,14 @@ namespace CXX
             if (poly)
             {
               os << "bool d;"
-                 << "::std::auto_ptr< " << type << " > r;"
+                 << auto_ptr << "< " << type << " > r;"
                  << "s >> d;"
                  << endl
                  << "if (!d)" << endl
                  << "r.reset (new " << type << " (s, f, this));"
                  << "else"
                  << "{"
-                 << "::std::auto_ptr< ::xsd::cxx::tree::type > tmp (" << endl
+                 << auto_ptr << "< ::xsd::cxx::tree::type > tmp (" << endl
                  << "::xsd::cxx::tree::stream_extraction_map_instance< " <<
                 poly_plate << ", " << stream << ", " << char_type <<
                 " > ().extract (" << endl
@@ -385,11 +390,11 @@ namespace CXX
             }
             else
             {
-              os << "::std::auto_ptr< " << type << " > r (new " << type <<
+              os << auto_ptr << "< " << type << " > r (new " << type <<
                 " (s, f, this));";
             }
 
-            os << "c.push_back (r);"
+            os << "c.push_back (" << r << ");"
                << "}" // while
                << "}" // if
                << "}";
@@ -407,14 +412,14 @@ namespace CXX
             if (poly)
             {
               os << "bool d;"
-                 << "::std::auto_ptr< " << type << " > r;"
+                 << auto_ptr << "< " << type << " > r;"
                  << "s >> d;"
                  << endl
                  << "if (!d)" << endl
                  << "r.reset (new " << type << " (s, f, this));"
                  << "else"
                  << "{"
-                 << "::std::auto_ptr< ::xsd::cxx::tree::type > tmp (" << endl
+                 << auto_ptr << "< ::xsd::cxx::tree::type > tmp (" << endl
                  << "::xsd::cxx::tree::stream_extraction_map_instance< " <<
                 poly_plate << ", " << stream << ", " << char_type <<
                 " > ().extract (" << endl
@@ -434,11 +439,11 @@ namespace CXX
             }
             else
             {
-              os << "::std::auto_ptr< " << type << " > r (new " << type <<
+              os << auto_ptr << "< " << type << " > r (new " << type <<
                 " (s, f, this));";
             }
 
-            os << "this->" << member << ".set (r);"
+            os << "this->" << member << ".set (" << r << ");"
                << "}" // if (p)
                << "}";
           }
@@ -451,14 +456,14 @@ namespace CXX
             if (poly)
             {
               os << "bool d;"
-                 << "::std::auto_ptr< " << type << " > r;"
+                 << auto_ptr << "< " << type << " > r;"
                  << "s >> d;"
                  << endl
                  << "if (!d)" << endl
                  << "r.reset (new " << type << " (s, f, this));"
                  << "else"
                  << "{"
-                 << "::std::auto_ptr< ::xsd::cxx::tree::type > tmp (" << endl
+                 << auto_ptr << "< ::xsd::cxx::tree::type > tmp (" << endl
                  << "::xsd::cxx::tree::stream_extraction_map_instance< " <<
                 poly_plate << ", " << stream << ", " << char_type <<
                 " > ().extract (" << endl
@@ -478,11 +483,11 @@ namespace CXX
             }
             else
             {
-              os << "::std::auto_ptr< " << type << " > r (new " << type <<
+              os << auto_ptr << "< " << type << " > r (new " << type <<
                 " (s, f, this));";
             }
 
-            os << "this->" << member << ".set (r);"
+            os << "this->" << member << ".set (" << r << ");"
                << "}";
           }
         }
@@ -526,9 +531,8 @@ namespace CXX
             }
             else
             {
-              os << "::std::auto_ptr< " << type << " > r (new " << type <<
-                " (s, f, this));"
-                 << "this->" << member << ".set (r);";
+              os << "this->" << member << ".set (" << auto_ptr << "< " <<
+                type << " > (new " << type << " (s, f, this)));";
             }
 
             os << "}" // if (p)
@@ -546,9 +550,8 @@ namespace CXX
             }
             else
             {
-              os << "::std::auto_ptr< " << type << " > r (new " << type <<
-                " (s, f, this));"
-                 << "this->" << member << ".set (r);";
+              os << "this->" << member << ".set (" << auto_ptr << "< " <<
+                type << " > (new " << type << " (s, f, this)));";
             }
 
             os << "}";
-- 
cgit v1.1