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/comparison | |
| parent | 45db924dfc19b49b7930522dbddd123fb9575e32 (diff) | |
Use std::unique_ptr instead of std::auto_ptr in C++11 mode
Diffstat (limited to 'tests/cxx/tree/comparison')
| -rw-r--r-- | tests/cxx/tree/comparison/driver.cxx | 4 | ||||
| -rw-r--r-- | tests/cxx/tree/comparison/makefile | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/tests/cxx/tree/comparison/driver.cxx b/tests/cxx/tree/comparison/driver.cxx index f6480bb..41e91a9 100644 --- a/tests/cxx/tree/comparison/driver.cxx +++ b/tests/cxx/tree/comparison/driver.cxx @@ -6,7 +6,7 @@ // Test generated comparison operators. // -#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])); + XSD_AUTO_PTR<type> r (root (argv[1])); type::complex_sequence s (r->complex ()); diff --git a/tests/cxx/tree/comparison/makefile b/tests/cxx/tree/comparison/makefile index 0ed2dd7..b88389c 100644 --- a/tests/cxx/tree/comparison/makefile +++ b/tests/cxx/tree/comparison/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. |