Update upstream source from tag 'upstream/4.2.0'

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

3 files changed, 0 insertions, 264 deletions

diff --git a/xsd/tests/cxx/tree/containment/driver.cxx b/xsd/tests/cxx/tree/containment/driver.cxx
deleted file mode 100644
index f019de8..0000000
--- a/xsd/tests/cxx/tree/containment/driver.cxx
+++ /dev/null
@@ -1,119 +0,0 @@
-// file      : tests/cxx/tree/containment/driver.cxx
-// copyright : Copyright (c) 2006-2014 Code Synthesis Tools CC
-// license   : GNU GPL v2 + exceptions; see accompanying LICENSE file
-
-// Test tree node containment.
-//
-
-#include <memory> // std::auto_ptr/unique_ptr
-#include <cassert>
-
-#include "test.hxx"
-
-#ifdef XSD_CXX11
-#  include <utility> // std::move
-#  define XSD_MOVE(x) std::move(x)
-#else
-#  define XSD_MOVE(x) x
-#endif
-
-using namespace std;
-using namespace test;
-
-int
-main ()
-{
-  // Change of a container in a sub-tree without ID.
-  //
-  {
-    XSD_AUTO_PTR<inner> i (new inner ());
-    i->ref ("foo");
-
-    outer o;
-    o.i (XSD_MOVE (i));
-    o.ref ("foo");
-
-    assert (o.i ()->ref ()->get () == 0);
-    assert (o.ref ()->get () == 0);
-  }
-
-  // Change of container in a sub-tree with ID inside.
-  //
-  {
-    XSD_AUTO_PTR<inner> i (new inner ());
-    inner* p (i.get ());
-    i->id ("foo");
-    i->ref ("foo");
-    assert (i->ref ()->get () == p);
-
-    outer o;
-    o.i (XSD_MOVE (i));
-    o.ref ("foo");
-
-    assert (o.i ()->ref ()->get () == p);
-    assert (o.ref ()->get () == p);
-  }
-
-  // Change of a container in ID.
-  //
-  {
-    XSD_AUTO_PTR<xml_schema::id> id (new xml_schema::id ("foo"));
-
-    inner i;
-    i.id (XSD_MOVE (id));
-    i.ref ("foo");
-    assert (i.ref ()->get () == &i);
-  }
-
-  // Change of a container in a type derived from ID with ID inside.
-  //
-  {
-    XSD_AUTO_PTR<id_ex> id (new id_ex ("foo"));
-    id_ex* p (id.get ());
-    id->id ("bar");
-
-    inner i;
-    i.id_ex (XSD_MOVE (id));
-
-    i.ref ("foo");
-    assert (i.ref ()->get () == &i);
-
-    i.ref ("bar");
-    assert (i.ref ()->get () == p);
-  }
-
-  // IDREF lists
-  //
-  {
-    id i1 ("a"), i2 ("b");
-
-    XSD_AUTO_PTR<ids> ic (new ids);
-    ic->id ().push_back (i1);
-    ic->id ().push_back (i2);
-
-    XSD_AUTO_PTR<xml_schema::idrefs> r1 (new xml_schema::idrefs);
-    r1->push_back (xml_schema::idref ("a"));
-    r1->push_back (xml_schema::idref ("b"));
-
-    XSD_AUTO_PTR<idref_list> r2 (new idref_list);
-    r2->push_back (xml_schema::idref ("a"));
-    r2->push_back (xml_schema::idref ("b"));
-
-    XSD_AUTO_PTR<idrefs1> rc1 (new idrefs1);
-    XSD_AUTO_PTR<idrefs2> rc2 (new idrefs2);
-
-    rc1->idrefs (XSD_MOVE (r1));
-    rc2->idrefs (XSD_MOVE (r2));
-
-    model m;
-    m.ids (XSD_MOVE (ic));
-    m.idrefs1 (XSD_MOVE (rc1));
-    m.idrefs2 (XSD_MOVE (rc2));
-
-    assert (m.idrefs1 ().idrefs ()[0].get () != 0);
-    assert (m.idrefs1 ().idrefs ()[1].get () != 0);
-
-    assert (m.idrefs2 ().idrefs ()[0].get () != 0);
-    assert (m.idrefs2 ().idrefs ()[1].get () != 0);
-  }
-}
diff --git a/xsd/tests/cxx/tree/containment/makefile b/xsd/tests/cxx/tree/containment/makefile
deleted file mode 100644
index d181fb5..0000000
--- a/xsd/tests/cxx/tree/containment/makefile
+++ /dev/null
@@ -1,86 +0,0 @@
-# file      : tests/cxx/tree/containment/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-default-ctor
-$(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)
-	$(call message,test $$1,$$1,$(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/containment/test.xsd b/xsd/tests/cxx/tree/containment/test.xsd
deleted file mode 100644
index 72c9379..0000000
--- a/xsd/tests/cxx/tree/containment/test.xsd
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:t="test" targetNamespace="test">
-
-  <complexType name="id-ex">
-    <simpleContent>
-      <extension base="ID">
-        <attribute name="id" type="ID"/>
-      </extension>
-    </simpleContent>
-  </complexType>
-
-  <complexType name="inner">
-    <sequence>
-      <element name="id" type="ID" minOccurs="0"/>
-      <element name="id-ex" type="t:id-ex" minOccurs="0"/>
-      <element name="ref" type="IDREF" minOccurs="0"/>
-    </sequence>
-  </complexType>
-
-  <complexType name="outer">
-    <sequence>
-      <element name="i" type="t:inner" minOccurs="0"/>
-      <element name="ref" type="IDREF" minOccurs="0"/>
-    </sequence>
-  </complexType>
-
-  <!-- IDREF lists -->
-
-  <complexType name="id">
-    <attribute name="id" type="ID" use="required"/>
-  </complexType>
-
-  <complexType name="ids">
-    <sequence>
-      <element name="id" type="t:id" minOccurs="0" maxOccurs="unbounded"/>
-    </sequence>
-  </complexType>
-
-  <complexType name="idrefs1">
-    <attribute name="idrefs" type="IDREFS" use="required"/>
-  </complexType>
-
-  <simpleType name="idref-list">
-    <list itemType="IDREF"/>
-  </simpleType>
-
-  <complexType name="idrefs2">
-    <attribute name="idrefs" type="t:idref-list" use="required"/>
-  </complexType>
-
-  <complexType name="model">
-    <sequence>
-      <element name="ids" type="t:ids"/>
-      <element name="idrefs1" type="t:idrefs1"/>
-      <element name="idrefs2" type="t:idrefs2"/>
-    </sequence>
-  </complexType>
-
-</schema>