3 files changed, 12 insertions, 42 deletions
diff --git a/xsd/tests/cxx/tree/float/driver.cxx b/xsd/tests/cxx/tree/float/driver.cxx
index d2ec1dd..a71d2f3 100644
--- a/xsd/tests/cxx/tree/float/driver.cxx
+++ b/xsd/tests/cxx/tree/float/driver.cxx
@@ -1,13 +1,12 @@
 // file      : tests/cxx/tree/float/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 floating point (xsd:{float, double, decimal}) type parsing
 // and serialization.
 //
 
-#include <memory> // std::auto_ptr
+#include <memory> // std::auto_ptr/unique_ptr
 #include <iostream>
 
 #include "test.hxx"
@@ -26,7 +25,7 @@ main (int argc, char* argv[])
 
   try
   {
-    auto_ptr<type> r (root (argv[1]));
+    XSD_AUTO_PTR<type> r (root (argv[1]));
 
     r->simple ().push_back (12.129456);
     r->simple ().push_back (123.129456);
diff --git a/xsd/tests/cxx/tree/float/makefile b/xsd/tests/cxx/tree/float/makefile
index 21966ba..a585afb 100644
--- a/xsd/tests/cxx/tree/float/makefile
+++ b/xsd/tests/cxx/tree/float/makefile
@@ -1,6 +1,5 @@
 # file      : tests/cxx/tree/float/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,17 +26,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)
 
 genf := $(xsd:.xsd=.hxx) $(xsd:.xsd=.ixx) $(xsd:.xsd=.cxx)
 gen  := $(addprefix $(out_base)/,$(genf))
 
 $(gen): xsd := $(out_root)/xsd/xsd
-$(gen): xsd_options := --generate-serialization --root-element-all
+$(gen): xsd_options += --generate-serialization --root-element-all
 $(gen): $(out_root)/xsd/xsd
 
-$(call include-dep,$(dep))
+$(call include-dep,$(dep),$(obj),$(gen))
 
 # Convenience alias for default target.
 #
@@ -74,7 +73,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/xsd/tests/cxx/tree/float/test.std b/xsd/tests/cxx/tree/float/test.std
index 44264c2..399e28c 100644
--- a/xsd/tests/cxx/tree/float/test.std
+++ b/xsd/tests/cxx/tree/float/test.std
@@ -1,68 +1,35 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <t:root xmlns:t="test" de="0" do="0" f="0" s="12.13">
-
   <float>0</float>
-
   <float>1</float>
-
   <float>1e+06</float>
-
   <float>1e-07</float>
-
   <float-list>0 1 1e+06 1e-07</float-list>
-
   <double>0</double>
-
   <double>1</double>
-
   <double>100000000000000</double>
-
   <double>1e-15</double>
-
   <double-list>0 1 100000000000000 1e-15</double-list>
-
   <decimal>0</decimal>
-
   <decimal>1</decimal>
-
   <decimal>10000</decimal>
-
   <decimal>100000000000000</decimal>
-
   <decimal>0.000000000000001</decimal>
-
   <decimal-list>0 1 100000000000000 0.000000000000001</decimal-list>
-
   <simple>0</simple>
-
   <simple>1</simple>
-
   <simple>12.34</simple>
-
   <simple>0.12</simple>
-
   <simple>12.13</simple>
-
   <simple>123.1</simple>
-
   <simple>1234</simple>
-
   <complex>0</complex>
-
   <complex>1</complex>
-
   <complex>12.34</complex>
-
   <complex>0.12</complex>
-
   <complex>12.13</complex>
-
   <complex>123.1</complex>
-
   <complex>1234</complex>
-
   <complex>-12.12</complex>
-
   <complex>-123.1</complex>
-
 </t:root>