New upstream release

2 files changed, 21 insertions, 8 deletions

diff --git a/xsd/tests/cxx/tree/naming/java/driver.cxx b/xsd/tests/cxx/tree/naming/java/driver.cxx
index 843acff..f35607a 100644
--- a/xsd/tests/cxx/tree/naming/java/driver.cxx
+++ b/xsd/tests/cxx/tree/naming/java/driver.cxx
@@ -1,12 +1,10 @@
 // file      : tests/cxx/tree/naming/java/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 Java naming style.
 //
 
-#include <memory> // std::auto_ptr
 #include <sstream>
 #include <iostream>
 
@@ -29,6 +27,7 @@ main ()
     {
       Gender::Value v;
       v = Gender::female;
+      XSD_UNUSED (v);
     }
 
     // Anonymous type.
@@ -49,6 +48,7 @@ main ()
       //
       {
         Type::FooType* p = 0;
+        XSD_UNUSED (p);
         Type::FooOptional o;
 
         if (t.getFoo ().present ())
@@ -61,6 +61,7 @@ main ()
       //
       {
         Type::BarType* p = 0;
+        XSD_UNUSED (p);
 
         if (t.getBar () != "bar")
           return 1;
@@ -72,9 +73,13 @@ main ()
       //
       {
         Type::BazType* p = 0;
+        XSD_UNUSED (p);
+
         Type::BazSequence s;
         Type::BazIterator i (s.begin ());
         Type::BazConstIterator ci (s.begin ());
+        XSD_UNUSED (i);
+        XSD_UNUSED (ci);
 
         if (t.getBaz () != s)
           return 1;
@@ -88,6 +93,8 @@ main ()
         Type::AnySequence s (t.getDomDocument ());
         Type::AnyIterator i (s.begin ());
         Type::AnyConstIterator  ci (s.begin ());
+        XSD_UNUSED (i);
+        XSD_UNUSED (ci);
 
         if (t.getAny () != s)
           return 1;
@@ -112,6 +119,8 @@ main ()
         Type::AnyAttributeSet s (t.getDomDocument ());
         Type::AnyAttributeIterator i (s.begin ());
         Type::AnyAttributeConstIterator ci (s.begin ());
+        XSD_UNUSED (i);
+        XSD_UNUSED (ci);
 
         if (t.getAnyAttribute () != s)
           return 1;
diff --git a/xsd/tests/cxx/tree/naming/java/makefile b/xsd/tests/cxx/tree/naming/java/makefile
index f8e7d04..83d73e1 100644
--- a/xsd/tests/cxx/tree/naming/java/makefile
+++ b/xsd/tests/cxx/tree/naming/java/makefile
@@ -1,6 +1,5 @@
 # file      : tests/cxx/tree/naming/java/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,7 +26,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=.hxx) $(xsd:.xsd=.ixx) $(xsd:.xsd=.cxx)
@@ -35,7 +34,7 @@ gen  := $(addprefix $(out_base)/,$(genf))
 
 $(gen): xsd := $(out_root)/xsd/xsd
 
-$(gen): xsd_options := \
+$(gen): xsd_options += \
 --type-naming java \
 --function-naming java \
 --generate-ostream \
@@ -45,7 +44,7 @@ $(gen): xsd_options := \
 
 $(gen): $(out_root)/xsd/xsd
 
-$(call include-dep,$(dep))
+$(call include-dep,$(dep),$(obj),$(gen))
 
 # Convenience alias for default target.
 #
@@ -82,7 +81,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.