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

---
 tests/cxx/tree/default/general/driver.cxx | 4 ++--
 tests/cxx/tree/default/general/makefile   | 5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)

(limited to 'tests/cxx/tree/default/general')

diff --git a/tests/cxx/tree/default/general/driver.cxx b/tests/cxx/tree/default/general/driver.cxx
index e9e5528..4c9cfc4 100644
--- a/tests/cxx/tree/default/general/driver.cxx
+++ b/tests/cxx/tree/default/general/driver.cxx
@@ -6,7 +6,7 @@
 // Test default attribute/element values.
 //
 
-#include <memory> // std::auto_ptr
+#include <memory> // std::auto_ptr/unique_ptr
 #include <iostream>
 
 #include "test.hxx"
@@ -25,7 +25,7 @@ main (int argc, char* argv[])
 
   try
   {
-    auto_ptr<type> r (root (argv[1], xml_schema::flags::dont_validate));
+    XSD_AUTO_PTR<type> r (root (argv[1], xml_schema::flags::dont_validate));
 
     xml_schema::namespace_infomap map;
     map["t"].name = "test";
diff --git a/tests/cxx/tree/default/general/makefile b/tests/cxx/tree/default/general/makefile
index 432c56c..045f085 100644
--- a/tests/cxx/tree/default/general/makefile
+++ b/tests/cxx/tree/default/general/makefile
@@ -75,7 +75,12 @@ endif
 $(call include,$(bld_root)/cxx/o-e.make)
 $(call include,$(bld_root)/cxx/cxx-o.make)
 $(call include,$(bld_root)/cxx/cxx-d.make)
+
+$(call include,$(bld_root)/cxx/standard.make) # cxx_standard
+ifdef cxx_standard
+$(gen): xsd_options += --std $(cxx_standard)
 $(call include,$(scf_root)/xsd/tree/xsd-cxx.make)
+endif
 
 
 # Dependencies.
-- 
cgit v1.1