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/wildcard | |
| parent | 45db924dfc19b49b7930522dbddd123fb9575e32 (diff) | |
Use std::unique_ptr instead of std::auto_ptr in C++11 mode
Diffstat (limited to 'tests/cxx/tree/wildcard')
| -rw-r--r-- | tests/cxx/tree/wildcard/driver.cxx | 10 | ||||
| -rw-r--r-- | tests/cxx/tree/wildcard/makefile | 5 |
2 files changed, 10 insertions, 5 deletions
diff --git a/tests/cxx/tree/wildcard/driver.cxx b/tests/cxx/tree/wildcard/driver.cxx index d784a97..9798159 100644 --- a/tests/cxx/tree/wildcard/driver.cxx +++ b/tests/cxx/tree/wildcard/driver.cxx @@ -6,13 +6,13 @@ // Test wildcard (any & anyAttribute) mapping. // -#include <memory> // std::auto_ptr +#include <memory> // std::auto_ptr/unique_ptr #include <sstream> #include <iostream> -#include <xsd/cxx/xml/string.hxx> +#include "test.hxx" // Get XSD_CXX11 defined. -#include "test.hxx" +#include <xsd/cxx/xml/string.hxx> using namespace std; using namespace test; @@ -170,7 +170,7 @@ main (int argc, char* argv[]) // Test parsing // - auto_ptr<type> r (root (argv[1])); + XSD_AUTO_PTR<type> r (root (argv[1])); print (*r); // Test serialization. @@ -187,7 +187,7 @@ main (int argc, char* argv[]) // cout << iostr.str () << endl // << endl; - auto_ptr<type> copy (root (iostr, argv[1])); + XSD_AUTO_PTR<type> copy (root (iostr, argv[1])); assert (*copy == *r); print (*copy); diff --git a/tests/cxx/tree/wildcard/makefile b/tests/cxx/tree/wildcard/makefile index 9b6a994..4adc8b9 100644 --- a/tests/cxx/tree/wildcard/makefile +++ b/tests/cxx/tree/wildcard/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. |