diff options
Diffstat (limited to 'tests/cxx/tree/naming')
-rw-r--r-- | tests/cxx/tree/naming/camel/driver.cxx | 1 | ||||
-rw-r--r-- | tests/cxx/tree/naming/camel/makefile | 5 | ||||
-rw-r--r-- | tests/cxx/tree/naming/java/driver.cxx | 1 | ||||
-rw-r--r-- | tests/cxx/tree/naming/java/makefile | 5 | ||||
-rw-r--r-- | tests/cxx/tree/naming/knr/driver.cxx | 1 | ||||
-rw-r--r-- | tests/cxx/tree/naming/knr/makefile | 5 |
6 files changed, 15 insertions, 3 deletions
diff --git a/tests/cxx/tree/naming/camel/driver.cxx b/tests/cxx/tree/naming/camel/driver.cxx index d3ea320..fa174d4 100644 --- a/tests/cxx/tree/naming/camel/driver.cxx +++ b/tests/cxx/tree/naming/camel/driver.cxx @@ -6,7 +6,6 @@ // Test camel case (upper for types, lower for functions) naming style. // -#include <memory> // std::auto_ptr #include <sstream> #include <iostream> diff --git a/tests/cxx/tree/naming/camel/makefile b/tests/cxx/tree/naming/camel/makefile index 78162db..b6c9498 100644 --- a/tests/cxx/tree/naming/camel/makefile +++ b/tests/cxx/tree/naming/camel/makefile @@ -82,7 +82,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/tests/cxx/tree/naming/java/driver.cxx b/tests/cxx/tree/naming/java/driver.cxx index 1c4bfdd..1e4adde 100644 --- a/tests/cxx/tree/naming/java/driver.cxx +++ b/tests/cxx/tree/naming/java/driver.cxx @@ -6,7 +6,6 @@ // Test Java naming style. // -#include <memory> // std::auto_ptr #include <sstream> #include <iostream> diff --git a/tests/cxx/tree/naming/java/makefile b/tests/cxx/tree/naming/java/makefile index 9cda154..41c5afd 100644 --- a/tests/cxx/tree/naming/java/makefile +++ b/tests/cxx/tree/naming/java/makefile @@ -82,7 +82,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/tests/cxx/tree/naming/knr/driver.cxx b/tests/cxx/tree/naming/knr/driver.cxx index 4960e04..bb980fc 100644 --- a/tests/cxx/tree/naming/knr/driver.cxx +++ b/tests/cxx/tree/naming/knr/driver.cxx @@ -6,7 +6,6 @@ // Test K&R naming style. // -#include <memory> // std::auto_ptr #include <sstream> #include <iostream> diff --git a/tests/cxx/tree/naming/knr/makefile b/tests/cxx/tree/naming/knr/makefile index 31836de..370055a 100644 --- a/tests/cxx/tree/naming/knr/makefile +++ b/tests/cxx/tree/naming/knr/makefile @@ -82,7 +82,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. |