From bada6666c70977a058755ccf232e7d67b24adeed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Wed, 23 Jul 2014 15:21:29 +0200 Subject: New upstream release --- xsd/tests/cxx/parser/validation/built-in/string/driver.cxx | 3 +-- xsd/tests/cxx/parser/validation/built-in/string/makefile | 14 ++++++++++---- 2 files changed, 11 insertions(+), 6 deletions(-) (limited to 'xsd/tests/cxx/parser/validation/built-in/string') diff --git a/xsd/tests/cxx/parser/validation/built-in/string/driver.cxx b/xsd/tests/cxx/parser/validation/built-in/string/driver.cxx index 2419d59..5948542 100644 --- a/xsd/tests/cxx/parser/validation/built-in/string/driver.cxx +++ b/xsd/tests/cxx/parser/validation/built-in/string/driver.cxx @@ -1,6 +1,5 @@ // file : tests/cxx/parser/validation/built-in/string/driver.cxx -// author : Boris Kolpackov -// 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 the built-in string & friends types validation. diff --git a/xsd/tests/cxx/parser/validation/built-in/string/makefile b/xsd/tests/cxx/parser/validation/built-in/string/makefile index 5be3c4c..41c0dcd 100644 --- a/xsd/tests/cxx/parser/validation/built-in/string/makefile +++ b/xsd/tests/cxx/parser/validation/built-in/string/makefile @@ -1,6 +1,5 @@ # file : tests/cxx/parser/validation/built-in/string/makefile -# author : Boris Kolpackov -# 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,10 +24,17 @@ $(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) -$(call include-dep,$(dep)) +# Define XSD_CXX11 since we include libxsd headers directly. +# +$(call include,$(bld_root)/cxx/standard.make) # cxx_standard +ifeq ($(cxx_standard),c++11) +$(obj) $(dep): cpp_options += -DXSD_CXX11 +endif + +$(call include-dep,$(dep),$(obj),$(gen)) # Convenience alias for default target. # -- cgit v1.2.3