diff options
Diffstat (limited to 'tests/cxx/tree/polymorphism')
-rw-r--r-- | tests/cxx/tree/polymorphism/comparison/driver.cxx | 4 | ||||
-rw-r--r-- | tests/cxx/tree/polymorphism/comparison/makefile | 5 | ||||
-rw-r--r-- | tests/cxx/tree/polymorphism/ostream/driver.cxx | 4 | ||||
-rw-r--r-- | tests/cxx/tree/polymorphism/ostream/makefile | 5 | ||||
-rw-r--r-- | tests/cxx/tree/polymorphism/same-type/driver.cxx | 4 | ||||
-rw-r--r-- | tests/cxx/tree/polymorphism/same-type/makefile | 5 |
6 files changed, 21 insertions, 6 deletions
diff --git a/tests/cxx/tree/polymorphism/comparison/driver.cxx b/tests/cxx/tree/polymorphism/comparison/driver.cxx index 049cc45..9a2f222 100644 --- a/tests/cxx/tree/polymorphism/comparison/driver.cxx +++ b/tests/cxx/tree/polymorphism/comparison/driver.cxx @@ -6,7 +6,7 @@ // Test comparison of polymorphic object models. // -#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])); // Equals. // diff --git a/tests/cxx/tree/polymorphism/comparison/makefile b/tests/cxx/tree/polymorphism/comparison/makefile index 91e541a..3ce8cc9 100644 --- a/tests/cxx/tree/polymorphism/comparison/makefile +++ b/tests/cxx/tree/polymorphism/comparison/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/polymorphism/ostream/driver.cxx b/tests/cxx/tree/polymorphism/ostream/driver.cxx index 836c329..9ff8a5f 100644 --- a/tests/cxx/tree/polymorphism/ostream/driver.cxx +++ b/tests/cxx/tree/polymorphism/ostream/driver.cxx @@ -6,7 +6,7 @@ // Test printing of polymorphic object models. // -#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])); cout << *r << endl; } catch (xml_schema::exception const& e) diff --git a/tests/cxx/tree/polymorphism/ostream/makefile b/tests/cxx/tree/polymorphism/ostream/makefile index 4512023..2f429db 100644 --- a/tests/cxx/tree/polymorphism/ostream/makefile +++ b/tests/cxx/tree/polymorphism/ostream/makefile @@ -76,7 +76,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/polymorphism/same-type/driver.cxx b/tests/cxx/tree/polymorphism/same-type/driver.cxx index 59ca905..162d397 100644 --- a/tests/cxx/tree/polymorphism/same-type/driver.cxx +++ b/tests/cxx/tree/polymorphism/same-type/driver.cxx @@ -6,7 +6,7 @@ // Test substitution group and xsi:type that don't change the type. // -#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])); cout << *r << endl; } diff --git a/tests/cxx/tree/polymorphism/same-type/makefile b/tests/cxx/tree/polymorphism/same-type/makefile index 88a7f3d..407fc07 100644 --- a/tests/cxx/tree/polymorphism/same-type/makefile +++ b/tests/cxx/tree/polymorphism/same-type/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. |