diff options
author | Boris Kolpackov <boris@codesynthesis.com> | 2014-01-19 10:05:08 +0200 |
---|---|---|
committer | Boris Kolpackov <boris@codesynthesis.com> | 2014-01-19 10:06:32 +0200 |
commit | 0fdf19714613a82a184f4f6e75fb9a4f9b62f18a (patch) | |
tree | 93bb2df0f9d9eab44d36dedf29d4df500ecefcbc /tests/cxx/tree/enumeration | |
parent | 45db924dfc19b49b7930522dbddd123fb9575e32 (diff) |
Use std::unique_ptr instead of std::auto_ptr in C++11 mode
Diffstat (limited to 'tests/cxx/tree/enumeration')
-rw-r--r-- | tests/cxx/tree/enumeration/ctor/makefile | 5 | ||||
-rw-r--r-- | tests/cxx/tree/enumeration/inheritance/driver.cxx | 4 | ||||
-rw-r--r-- | tests/cxx/tree/enumeration/inheritance/makefile | 5 |
3 files changed, 12 insertions, 2 deletions
diff --git a/tests/cxx/tree/enumeration/ctor/makefile b/tests/cxx/tree/enumeration/ctor/makefile index 947bdfc..9f6162c 100644 --- a/tests/cxx/tree/enumeration/ctor/makefile +++ b/tests/cxx/tree/enumeration/ctor/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. diff --git a/tests/cxx/tree/enumeration/inheritance/driver.cxx b/tests/cxx/tree/enumeration/inheritance/driver.cxx index 1842982..4fb05a1 100644 --- a/tests/cxx/tree/enumeration/inheritance/driver.cxx +++ b/tests/cxx/tree/enumeration/inheritance/driver.cxx @@ -6,7 +6,7 @@ // Insert test description here. // -#include <memory> // std::auto_ptr +#include <memory> // std::auto_ptr/unique_ptr #include <cassert> #include <iostream> @@ -26,7 +26,7 @@ main (int argc, char* argv[]) try { - auto_ptr<top_bottom> r (root (argv[1])); + XSD_AUTO_PTR<top_bottom> r (root (argv[1])); switch (*r) { diff --git a/tests/cxx/tree/enumeration/inheritance/makefile b/tests/cxx/tree/enumeration/inheritance/makefile index 54f9a3c..cdce770 100644 --- a/tests/cxx/tree/enumeration/inheritance/makefile +++ b/tests/cxx/tree/enumeration/inheritance/makefile @@ -74,7 +74,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. |