summaryrefslogtreecommitdiff
path: root/xsd/tests/cxx/parser/validation/built-in/long
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2014-07-23 15:21:29 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2014-07-23 15:21:29 +0200
commitbada6666c70977a058755ccf232e7d67b24adeed (patch)
tree1e92d50cebce96abaf9bce19e36026c47f77b9ba /xsd/tests/cxx/parser/validation/built-in/long
parenteaf34adcbd8095bc6d1f3371b1227f654c7b19fc (diff)
New upstream release
Diffstat (limited to 'xsd/tests/cxx/parser/validation/built-in/long')
-rw-r--r--xsd/tests/cxx/parser/validation/built-in/long/driver.cxx3
-rw-r--r--xsd/tests/cxx/parser/validation/built-in/long/makefile14
2 files changed, 11 insertions, 6 deletions
diff --git a/xsd/tests/cxx/parser/validation/built-in/long/driver.cxx b/xsd/tests/cxx/parser/validation/built-in/long/driver.cxx
index c7a66c4..2033125 100644
--- a/xsd/tests/cxx/parser/validation/built-in/long/driver.cxx
+++ b/xsd/tests/cxx/parser/validation/built-in/long/driver.cxx
@@ -1,6 +1,5 @@
// file : tests/cxx/parser/validation/built-in/long/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 the built-in long and unsigned long types validation.
diff --git a/xsd/tests/cxx/parser/validation/built-in/long/makefile b/xsd/tests/cxx/parser/validation/built-in/long/makefile
index 2ab6368..b3ad382 100644
--- a/xsd/tests/cxx/parser/validation/built-in/long/makefile
+++ b/xsd/tests/cxx/parser/validation/built-in/long/makefile
@@ -1,6 +1,5 @@
# file : tests/cxx/parser/validation/built-in/long/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,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.
#