Update upstream source from tag 'upstream/4.2.0'

Update to upstream version '4.2.0'
with Debian dir 1b38df7bbcf313223de3c50107ac0255090fe647

6 files changed, 0 insertions, 203 deletions

diff --git a/xsd/tests/cxx/tree/name-clash/inheritance/driver.cxx b/xsd/tests/cxx/tree/name-clash/inheritance/driver.cxx
deleted file mode 100644
index 07e0c00..0000000
--- a/xsd/tests/cxx/tree/name-clash/inheritance/driver.cxx
+++ /dev/null
@@ -1,36 +0,0 @@
-// file      : tests/cxx/tree/name-clash/inheritance/driver.cxx
-// copyright : Copyright (c) 2006-2014 Code Synthesis Tools CC
-// license   : GNU GPL v2 + exceptions; see accompanying LICENSE file
-
-// Test for name clashes across inheritance hierarchy.
-//
-
-#include <memory> // std::auto_ptr/unique_ptr
-#include <iostream>
-
-#include "test.hxx"
-
-using namespace std;
-using namespace test;
-
-int
-main (int argc, char* argv[])
-{
-  if (argc != 2)
-  {
-    cerr << "usage: " << argv[0] << " test.xml" << endl;
-    return 1;
-  }
-
-  try
-  {
-    XSD_AUTO_PTR<derived> r (root (argv[1]));
-
-    cout << *r << endl;
-  }
-  catch (xml_schema::exception const& e)
-  {
-    cerr << e << endl;
-    return 1;
-  }
-}
diff --git a/xsd/tests/cxx/tree/name-clash/inheritance/makefile b/xsd/tests/cxx/tree/name-clash/inheritance/makefile
deleted file mode 100644
index ea05693..0000000
--- a/xsd/tests/cxx/tree/name-clash/inheritance/makefile
+++ /dev/null
@@ -1,86 +0,0 @@
-# file      : tests/cxx/tree/name-clash/inheritance/makefile
-# 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
-
-xsd := test.xsd
-cxx := driver.cxx
-
-obj := $(addprefix $(out_base)/,$(cxx:.cxx=.o) $(xsd:.xsd=.o))
-dep := $(obj:.o=.o.d)
-
-driver := $(out_base)/driver
-test   := $(out_base)/.test
-clean  := $(out_base)/.clean
-
-
-# Import.
-#
-$(call import,\
-  $(scf_root)/import/libxerces-c/stub.make,\
-  l: xerces_c.l,cpp-options: xerces_c.l.cpp-options)
-
-
-# Build.
-#
-$(driver): $(obj) $(xerces_c.l)
-
-$(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-ostream
-$(gen): $(out_root)/xsd/xsd
-
-$(call include-dep,$(dep),$(obj),$(gen))
-
-# Convenience alias for default target.
-#
-$(out_base)/: $(driver)
-
-
-# Test.
-#
-$(test): driver := $(driver)
-$(test): $(driver) $(src_base)/test.xml $(src_base)/output
-	$(call message,test $$1,$$1 $(src_base)/test.xml | diff -u $(src_base)/output -,$(driver))
-
-# Clean.
-#
-$(clean): $(driver).o.clean                                \
-  $(addsuffix .cxx.clean,$(obj))                           \
-  $(addsuffix .cxx.clean,$(dep))                           \
-  $(addprefix $(out_base)/,$(xsd:.xsd=.cxx.xsd.clean))
-
-# Generated .gitignore.
-#
-ifeq ($(out_base),$(src_base))
-$(gen): | $(out_base)/.gitignore
-$(driver): | $(out_base)/.gitignore
-
-$(out_base)/.gitignore: files := driver $(genf)
-$(clean): $(out_base)/.gitignore.clean
-
-$(call include,$(bld_root)/git/gitignore.make)
-endif
-
-# How to.
-#
-$(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.
-#
-$(call import,$(src_root)/xsd/makefile)
diff --git a/xsd/tests/cxx/tree/name-clash/inheritance/output b/xsd/tests/cxx/tree/name-clash/inheritance/output
deleted file mode 100644
index 54565bb..0000000
--- a/xsd/tests/cxx/tree/name-clash/inheritance/output
+++ /dev/null
@@ -1,3 +0,0 @@
-
-e: e
-e: e1
diff --git a/xsd/tests/cxx/tree/name-clash/inheritance/test.xml b/xsd/tests/cxx/tree/name-clash/inheritance/test.xml
deleted file mode 100644
index 8c17101..0000000
--- a/xsd/tests/cxx/tree/name-clash/inheritance/test.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<t:root xmlns:t="test"
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:schemaLocation="test test.xsd">
-		
-  <e>e</e>
-  <e>e1</e>
-    
-</t:root>
diff --git a/xsd/tests/cxx/tree/name-clash/inheritance/test.xsd b/xsd/tests/cxx/tree/name-clash/inheritance/test.xsd
deleted file mode 100644
index b83d7df..0000000
--- a/xsd/tests/cxx/tree/name-clash/inheritance/test.xsd
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:t="test" targetNamespace="test">
-
-  <!-- same member name in base and derived -->
-
-  <complexType name="base">
-    <sequence>
-      <element name="e" type="string"/>
-    </sequence>
-  </complexType>
-
-  <complexType name="derived">
-    <complexContent>
-      <extension base="t:base">
-        <sequence>
-          <element name="e" type="string"/>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-
-  <element name="root" type="t:derived"/>
-
-  <!-- same c-tor argument names (compilation only) -->
-
-  <complexType name="ctor-args">
-    <simpleContent>
-      <extension base="string">
-        <attribute name="string" type="string" use="required"/>
-      </extension>
-    </simpleContent>
-  </complexType>
-
-
-  <!-- same c-tor argument names (compilation only) -->
-
-  <complexType name="ctor-args-base">
-    <simpleContent>
-      <extension base="string">
-        <attribute name="ctor-args-derived" type="string" use="required"/>
-      </extension>
-    </simpleContent>
-  </complexType>
-
-  <complexType name="ctor-args-derived">
-    <simpleContent>
-      <extension base="t:ctor-args-base">
-        <attribute name="foo" type="string" use="required"/>
-      </extension>
-    </simpleContent>
-  </complexType>
-
-</schema>
diff --git a/xsd/tests/cxx/tree/name-clash/makefile b/xsd/tests/cxx/tree/name-clash/makefile
deleted file mode 100644
index c9a4d0f..0000000
--- a/xsd/tests/cxx/tree/name-clash/makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# file      : tests/cxx/tree/name-clash/makefile
-# 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
-
-tests := inheritance
-
-default   := $(out_base)/
-test      := $(out_base)/.test
-clean     := $(out_base)/.clean
-
-$(default): $(addprefix $(out_base)/,$(addsuffix /,$(tests)))
-$(test): $(addprefix $(out_base)/,$(addsuffix /.test,$(tests)))
-$(clean): $(addprefix $(out_base)/,$(addsuffix /.clean,$(tests)))
-
-$(foreach t,$(tests),$(call import,$(src_base)/$t/makefile))