diff options
Diffstat (limited to 'tests/cxx/tree/binary/cdr')
| -rw-r--r-- | tests/cxx/tree/binary/cdr/driver.cxx | 6 | ||||
| -rw-r--r-- | tests/cxx/tree/binary/cdr/makefile | 5 |
2 files changed, 8 insertions, 3 deletions
diff --git a/tests/cxx/tree/binary/cdr/driver.cxx b/tests/cxx/tree/binary/cdr/driver.cxx index 012c2cf..9980579 100644 --- a/tests/cxx/tree/binary/cdr/driver.cxx +++ b/tests/cxx/tree/binary/cdr/driver.cxx @@ -6,7 +6,7 @@ // Test non-polymorphic binary serialization to ACE CDR. // -#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<type> r (root (argv[1])); + XSD_AUTO_PTR<type> r (root (argv[1])); // Save to a CDR stream. // @@ -38,7 +38,7 @@ main (int argc, char* argv[]) // ACE_InputCDR ace_icdr (ace_ocdr); xml_schema::istream<ACE_InputCDR> icdr (ace_icdr); - auto_ptr<type> c (new type (icdr)); + XSD_AUTO_PTR<type> c (new type (icdr)); // Compare the two. // diff --git a/tests/cxx/tree/binary/cdr/makefile b/tests/cxx/tree/binary/cdr/makefile index 0fce1e9..c77a026 100644 --- a/tests/cxx/tree/binary/cdr/makefile +++ b/tests/cxx/tree/binary/cdr/makefile @@ -78,7 +78,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. |