diff options
Diffstat (limited to 'xsd/tests/cxx/parser/built-in')
| -rw-r--r-- | xsd/tests/cxx/parser/built-in/driver.cxx | 9 | ||||
| -rw-r--r-- | xsd/tests/cxx/parser/built-in/makefile | 12 |
2 files changed, 12 insertions, 9 deletions
diff --git a/xsd/tests/cxx/parser/built-in/driver.cxx b/xsd/tests/cxx/parser/built-in/driver.cxx index 11cae41..2791387 100644 --- a/xsd/tests/cxx/parser/built-in/driver.cxx +++ b/xsd/tests/cxx/parser/built-in/driver.cxx @@ -1,6 +1,5 @@ // file : tests/cxx/parser/built-in/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 built-in type parsing. @@ -24,7 +23,7 @@ struct any_type_pimpl: xml_schema::any_type_pimpl } virtual void - _start_any_element (ro_string const&, + _start_any_element (ro_string const&, ro_string const& n, ro_string const*) { @@ -278,14 +277,14 @@ struct type_pimpl: type_pskel } virtual void - base64_binary (std::auto_ptr<xml_schema::buffer> v) + base64_binary (XSD_AUTO_PTR<xml_schema::buffer> v) { std::string tmp (v->data (), v->size ()); cout << "'" << tmp << "'" << endl; } virtual void - hex_binary (std::auto_ptr<xml_schema::buffer> v) + hex_binary (XSD_AUTO_PTR<xml_schema::buffer> v) { std::string tmp (v->data (), v->size ()); cout << "'" << tmp << "'" << endl; diff --git a/xsd/tests/cxx/parser/built-in/makefile b/xsd/tests/cxx/parser/built-in/makefile index 3164219..64987d0 100644 --- a/xsd/tests/cxx/parser/built-in/makefile +++ b/xsd/tests/cxx/parser/built-in/makefile @@ -1,6 +1,5 @@ # file : tests/cxx/parser/built-in/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 @@ -25,7 +24,7 @@ $(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=-pskel.hxx) $(xsd:.xsd=-pskel.ixx) $(xsd:.xsd=-pskel.cxx) @@ -34,7 +33,7 @@ gen := $(addprefix $(out_base)/,$(genf)) $(gen): xsd := $(out_root)/xsd/xsd $(gen): $(out_root)/xsd/xsd -$(call include-dep,$(dep)) +$(call include-dep,$(dep),$(obj),$(gen)) # Convenience alias for default target. # @@ -71,7 +70,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/parser/xsd-cxx.make) +endif # Dependencies. |