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/parser/generator.cxx | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'xsd/cxx/parser/generator.cxx')

diff --git a/xsd/cxx/parser/generator.cxx b/xsd/cxx/parser/generator.cxx
index a262004..46a0687 100644
--- a/xsd/cxx/parser/generator.cxx
+++ b/xsd/cxx/parser/generator.cxx
@@ -290,12 +290,14 @@ namespace CXX
           string_type = L"::std::basic_string< " + char_type + L" >";
 
         String xns;
+        String auto_ptr;
         {
           Context ctx (std::wcerr, schema, file_path, ops, 0, 0, 0, 0);
           xns = ctx.xs_ns_name ();
+          auto_ptr = ctx.auto_ptr;
         }
 
-        String buffer (L"::std::auto_ptr< " + xns + L"::buffer >");
+        String buffer (auto_ptr + L"< " + xns + L"::buffer >");
         TypeMap::Namespace xsd ("http://www\\.w3\\.org/2001/XMLSchema");
 
         xsd.types_push_back ("string", string_type);
@@ -777,6 +779,14 @@ namespace CXX
             << "#define " << guard << endl
             << endl;
 
+        if (ctx.std >= cxx_version::cxx11)
+        {
+          hxx << "#ifndef XSD_CXX11" << endl
+              << "#define XSD_CXX11" << endl
+              << "#endif" << endl
+              << endl;
+        }
+
         // Version check.
         //
         hxx << "#include <xsd/cxx/config.hxx>" << endl
-- 
cgit v1.1