From 899728d08993676b01e722a28f60efb2d076534d Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Tue, 1 Dec 2009 11:05:10 +0200
Subject: Make the list type a container for its elements

---
 xsd/cxx/tree/stream-extraction-source.cxx | 2 +-
 xsd/cxx/tree/tree-header.cxx              | 2 +-
 xsd/cxx/tree/tree-inline.cxx              | 7 ++++---
 xsd/cxx/tree/tree-source.cxx              | 6 +++---
 4 files changed, 9 insertions(+), 8 deletions(-)

(limited to 'xsd/cxx')

diff --git a/xsd/cxx/tree/stream-extraction-source.cxx b/xsd/cxx/tree/stream-extraction-source.cxx
index 8b92040..27b3ca7 100644
--- a/xsd/cxx/tree/stream-extraction-source.cxx
+++ b/xsd/cxx/tree/stream-extraction-source.cxx
@@ -55,7 +55,7 @@ namespace CXX
                << flags_type << " f," << endl
                << container << "* c)" << endl
                << ": " << any_simple_type << " (s, f, c)," << endl
-               << "  " << base <<  " (s, f, c)"
+               << "  " << base <<  " (s, f, this)"
                << "{"
                << "}";
 
diff --git a/xsd/cxx/tree/tree-header.cxx b/xsd/cxx/tree/tree-header.cxx
index 6b1490c..a63dcbe 100644
--- a/xsd/cxx/tree/tree-header.cxx
+++ b/xsd/cxx/tree/tree-header.cxx
@@ -135,7 +135,7 @@ namespace CXX
           os << "template < typename " << iter_type << " >" << endl
              << name << " (const " << iter_type << "& begin, const " <<
             iter_type << "& end)" << endl
-             << ": " << base_type << " (begin, end)"
+             << ": " << base_type << " (begin, end, this)"
              << "{"
              << "}";
 
diff --git a/xsd/cxx/tree/tree-inline.cxx b/xsd/cxx/tree/tree-inline.cxx
index 5bec713..0b834af 100644
--- a/xsd/cxx/tree/tree-inline.cxx
+++ b/xsd/cxx/tree/tree-inline.cxx
@@ -52,7 +52,8 @@ namespace CXX
           //
           os << inl
              << name << "::" << endl
-             << name << " ()"
+             << name << " ()" << endl
+             << ": " << base_type << " (0, this)"
              << "{"
              << "}";
 
@@ -66,7 +67,7 @@ namespace CXX
              << name << "::" << endl
              << name << " (" << size_type << " n, const " << item_name <<
             "& x)" << endl
-             << ": " << base_type << " (n, x)"
+             << ": " << base_type << " (n, x, this)"
              << "{"
              << "}";
 
@@ -78,7 +79,7 @@ namespace CXX
              << flags_type << " f," << endl
              << container << "* c)" << endl
              << ": " << any_simple_type << " (o, f, c)," << endl
-             << "  " << base_type << " (o, f, c)"
+             << "  " << base_type << " (o, f, this)"
              << "{"
              << "}";
         }
diff --git a/xsd/cxx/tree/tree-source.cxx b/xsd/cxx/tree/tree-source.cxx
index 7952e38..4b4b301 100644
--- a/xsd/cxx/tree/tree-source.cxx
+++ b/xsd/cxx/tree/tree-source.cxx
@@ -62,7 +62,7 @@ namespace CXX
                << flags_type << " f," << endl
                << container << "* c)" << endl
                << ": " << any_simple_type << " (e, f, c)," << endl
-               << "  " << base << " (e, f, c)"
+               << "  " << base << " (e, f, this)"
                << "{"
                << "}";
 
@@ -73,7 +73,7 @@ namespace CXX
                << flags_type << " f," << endl
                << container << "* c)" << endl
                << ": " << any_simple_type << " (a, f, c)," << endl
-               << "  " << base << " (a, f, c)"
+               << "  " << base << " (a, f, this)"
                << "{"
                << "}";
 
@@ -85,7 +85,7 @@ namespace CXX
                << flags_type << " f," << endl
                << container << "* c)" << endl
                << ": " << any_simple_type << " (s, e, f, c)," << endl
-               << "  " << base << " (s, e, f, c)"
+               << "  " << base << " (s, e, f, this)"
                << "{"
                << "}";
           }
-- 
cgit v1.1