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/built-in | |
| parent | 45db924dfc19b49b7930522dbddd123fb9575e32 (diff) | |
Use std::unique_ptr instead of std::auto_ptr in C++11 mode
Diffstat (limited to 'tests/cxx/tree/built-in')
| -rw-r--r-- | tests/cxx/tree/built-in/driver.cxx | 19 | ||||
| -rw-r--r-- | tests/cxx/tree/built-in/makefile | 5 |
2 files changed, 15 insertions, 9 deletions
diff --git a/tests/cxx/tree/built-in/driver.cxx b/tests/cxx/tree/built-in/driver.cxx index fee634a..f1d02a5 100644 --- a/tests/cxx/tree/built-in/driver.cxx +++ b/tests/cxx/tree/built-in/driver.cxx @@ -6,7 +6,7 @@ // Test built-in type mapping. // -#include <memory> // std::auto_ptr +#include <memory> // std::auto_ptr/unique_ptr #include <sstream> #include <iostream> @@ -15,7 +15,6 @@ using std::cerr; using std::endl; -using std::auto_ptr; int main (int argc, char* argv[]) @@ -26,12 +25,13 @@ main (int argc, char* argv[]) return 1; } - auto_ptr<xmlns::test::Elements> elements (xmlns::test::elements (argv[1])); + XSD_AUTO_PTR<xmlns::test::Elements> elements ( + xmlns::test::elements (argv[1])); - auto_ptr<xmlns::test::Attributes> attributes ( + XSD_AUTO_PTR<xmlns::test::Attributes> attributes ( xmlns::test::attributes (argv[2])); - auto_ptr<xmlns::test::Inherited> inherited ( + XSD_AUTO_PTR<xmlns::test::Inherited> inherited ( xmlns::test::inherited (argv[3])); cerr << "elements: " << *elements << endl @@ -53,13 +53,14 @@ main (int argc, char* argv[]) xmlns::test::elements (ostr, *elements, map); std::istringstream istr (ostr.str ()); - auto_ptr<xmlns::test::Elements> elements1 (xmlns::test::elements (istr)); + XSD_AUTO_PTR<xmlns::test::Elements> elements1 ( + xmlns::test::elements (istr)); std::ostringstream ostr1; xmlns::test::elements (ostr1, *elements1, map); if (ostr.str () != ostr1.str ()) - return 1; + return 1; } { @@ -67,7 +68,7 @@ main (int argc, char* argv[]) xmlns::test::attributes (ostr, *attributes, map); std::istringstream istr (ostr.str ()); - auto_ptr<xmlns::test::Attributes> attributes1 ( + XSD_AUTO_PTR<xmlns::test::Attributes> attributes1 ( xmlns::test::attributes (istr)); std::ostringstream ostr1; @@ -82,7 +83,7 @@ main (int argc, char* argv[]) xmlns::test::inherited (ostr, *inherited, map); std::istringstream istr (ostr.str ()); - auto_ptr<xmlns::test::Inherited> inherited1 ( + XSD_AUTO_PTR<xmlns::test::Inherited> inherited1 ( xmlns::test::inherited (istr)); std::ostringstream ostr1; diff --git a/tests/cxx/tree/built-in/makefile b/tests/cxx/tree/built-in/makefile index ad8aba1..b94930f 100644 --- a/tests/cxx/tree/built-in/makefile +++ b/tests/cxx/tree/built-in/makefile @@ -89,7 +89,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. # |