diff options
Diffstat (limited to 'xsd/tests/cxx/tree/prefix')
| -rw-r--r-- | xsd/tests/cxx/tree/prefix/driver.cxx | 7 | ||||
| -rw-r--r-- | xsd/tests/cxx/tree/prefix/makefile | 16 | ||||
| -rw-r--r-- | xsd/tests/cxx/tree/prefix/output | 4 |
3 files changed, 13 insertions, 14 deletions
diff --git a/xsd/tests/cxx/tree/prefix/driver.cxx b/xsd/tests/cxx/tree/prefix/driver.cxx index 3ce9832..244f815 100644 --- a/xsd/tests/cxx/tree/prefix/driver.cxx +++ b/xsd/tests/cxx/tree/prefix/driver.cxx @@ -1,12 +1,11 @@ // file : tests/cxx/tree/prefix/driver.cxx -// author : Boris Kolpackov <boris@codesynthesis.com> -// copyright : Copyright (c) 2006-2010 Code Synthesis Tools CC +// copyright : Copyright (c) 2006-2014 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file // Test automatic prefix assignment. // -#include <memory> // std::auto_ptr +#include <memory> // std::auto_ptr/unique_ptr #include <iostream> #include "test.hxx" @@ -25,7 +24,7 @@ main (int argc, char* argv[]) try { - auto_ptr<type> r (root (argv[1])); + XSD_AUTO_PTR<type> r (root (argv[1])); root (std::cout, *r); } catch (xml_schema::exception const& e) diff --git a/xsd/tests/cxx/tree/prefix/makefile b/xsd/tests/cxx/tree/prefix/makefile index 3317161..688111e 100644 --- a/xsd/tests/cxx/tree/prefix/makefile +++ b/xsd/tests/cxx/tree/prefix/makefile @@ -1,6 +1,5 @@ # file : tests/cxx/tree/prefix/makefile -# author : Boris Kolpackov <boris@codesynthesis.com> -# copyright : Copyright (c) 2006-2010 Code Synthesis Tools CC +# copyright : Copyright (c) 2006-2014 Code Synthesis Tools CC # license : GNU GPL v2 + exceptions; see accompanying LICENSE file include $(dir $(lastword $(MAKEFILE_LIST)))../../../../build/bootstrap.make @@ -27,18 +26,18 @@ $(call import,\ # $(driver): $(obj) $(xerces_c.l) -$(obj) $(dep): cpp_options := -I$(src_root)/libxsd +$(obj) $(dep): cpp_options := -I$(out_base) -I$(src_base) -I$(src_root)/libxsd $(obj) $(dep): $(xerces_c.l.cpp-options) genf := $(xsd:.xsd=.hxx) $(xsd:.xsd=.ixx) $(xsd:.xsd=.cxx) gen := $(addprefix $(out_base)/,$(genf)) $(gen): xsd := $(out_root)/xsd/xsd -$(gen): xsd_options := --generate-serialization --generate-polymorphic \ ---polymorphic-type foo\\\#base --root-element root +$(gen): xsd_options += --generate-serialization --generate-polymorphic \ +--polymorphic-type foo\#base --root-element root $(gen): $(out_root)/xsd/xsd -$(call include-dep,$(dep)) +$(call include-dep,$(dep),$(obj),$(gen)) # Convenience alias for default target. # @@ -75,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. diff --git a/xsd/tests/cxx/tree/prefix/output b/xsd/tests/cxx/tree/prefix/output index 4f40f49..9801a23 100644 --- a/xsd/tests/cxx/tree/prefix/output +++ b/xsd/tests/cxx/tree/prefix/output @@ -1,22 +1,18 @@ <?xml version="1.0" encoding="UTF-8" standalone="no" ?> <p1:root xmlns:p1="test"> - <a xmlns:p3="bar" p3:abar="456" xmlns:p2="foo"> <p2:efoo>123</p2:efoo> </a> - <b xmlns:p2="bar"> <p2:derived> <x>1</x> <y>2</y> </p2:derived> </b> - <c xmlns:p2="foo" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <p2:base xmlns:p3="bar" xsi:type="p3:derived2"> <x>1</x> <z>2</z> </p2:base> </c> - </p1:root> |