aboutsummaryrefslogtreecommitdiff
path: root/xsd/cxx/tree
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2011-07-27 11:58:50 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2011-07-27 11:58:50 +0200
commit72c8c02e5c841da2ec07a74d0a385c89209937a4 (patch)
tree037e08c35e824209fa7bf721d76c7f65bbb788cd /xsd/cxx/tree
parentaa6aee72b74f6d1f0eece7d2f57ca7d71173214e (diff)
Make sure we don't process sourced schemas more than once
Diffstat (limited to 'xsd/cxx/tree')
-rw-r--r--xsd/cxx/tree/counter.cxx2
-rw-r--r--xsd/cxx/tree/name-processor.cxx2
-rw-r--r--xsd/cxx/tree/parser-header.cxx2
-rw-r--r--xsd/cxx/tree/parser-source.cxx2
-rw-r--r--xsd/cxx/tree/serialization-header.cxx2
-rw-r--r--xsd/cxx/tree/serialization-source.cxx2
-rw-r--r--xsd/cxx/tree/stream-extraction-source.cxx2
-rw-r--r--xsd/cxx/tree/stream-header.cxx2
-rw-r--r--xsd/cxx/tree/stream-insertion-header.cxx2
-rw-r--r--xsd/cxx/tree/stream-insertion-source.cxx2
-rw-r--r--xsd/cxx/tree/stream-source.cxx2
-rw-r--r--xsd/cxx/tree/tree-forward.cxx2
-rw-r--r--xsd/cxx/tree/tree-header.cxx2
-rw-r--r--xsd/cxx/tree/tree-inline.cxx2
-rw-r--r--xsd/cxx/tree/tree-source.cxx2
-rw-r--r--xsd/cxx/tree/validator.cxx4
16 files changed, 17 insertions, 17 deletions
diff --git a/xsd/cxx/tree/counter.cxx b/xsd/cxx/tree/counter.cxx
index 5a89bbe..6888b2a 100644
--- a/xsd/cxx/tree/counter.cxx
+++ b/xsd/cxx/tree/counter.cxx
@@ -244,7 +244,7 @@ namespace CXX
Context ctx (std::wcerr, tu, path, options, counts, false, 0, 0, 0, 0);
Traversal::Schema schema;
- Traversal::Sources sources;
+ Sources sources;
schema >> sources >> schema;
diff --git a/xsd/cxx/tree/name-processor.cxx b/xsd/cxx/tree/name-processor.cxx
index 965e5ad..b731b82 100644
--- a/xsd/cxx/tree/name-processor.cxx
+++ b/xsd/cxx/tree/name-processor.cxx
@@ -2064,7 +2064,7 @@ namespace CXX
//
{
Traversal::Schema schema;
- Traversal::Sources sources;
+ Sources sources;
schema >> sources >> schema;
diff --git a/xsd/cxx/tree/parser-header.cxx b/xsd/cxx/tree/parser-header.cxx
index 68244a6..61eb79a 100644
--- a/xsd/cxx/tree/parser-header.cxx
+++ b/xsd/cxx/tree/parser-header.cxx
@@ -460,7 +460,7 @@ namespace CXX
<< endl;
Traversal::Schema schema;
- Traversal::Sources sources;
+ Sources sources;
Traversal::Names names_ns, names;
Namespace ns (ctx);
ElementFunction element (ctx);
diff --git a/xsd/cxx/tree/parser-source.cxx b/xsd/cxx/tree/parser-source.cxx
index ed71d52..c4fcf57 100644
--- a/xsd/cxx/tree/parser-source.cxx
+++ b/xsd/cxx/tree/parser-source.cxx
@@ -528,7 +528,7 @@ namespace CXX
<< endl;
Traversal::Schema schema;
- Traversal::Sources sources;
+ Sources sources;
Traversal::Names names_ns, names;
Namespace ns (ctx, first, last);
ElementFunction element (ctx);
diff --git a/xsd/cxx/tree/serialization-header.cxx b/xsd/cxx/tree/serialization-header.cxx
index ec2f656..c7b9c1f 100644
--- a/xsd/cxx/tree/serialization-header.cxx
+++ b/xsd/cxx/tree/serialization-header.cxx
@@ -550,7 +550,7 @@ namespace CXX
Traversal::Schema schema;
- Traversal::Sources sources;
+ Sources sources;
Traversal::Names names_ns, names;
Namespace ns (ctx);
diff --git a/xsd/cxx/tree/serialization-source.cxx b/xsd/cxx/tree/serialization-source.cxx
index f262966..6519d32 100644
--- a/xsd/cxx/tree/serialization-source.cxx
+++ b/xsd/cxx/tree/serialization-source.cxx
@@ -1302,7 +1302,7 @@ namespace CXX
Traversal::Schema schema;
- Traversal::Sources sources;
+ Sources sources;
Traversal::Names names_ns, names;
Namespace ns (ctx, first, last);
diff --git a/xsd/cxx/tree/stream-extraction-source.cxx b/xsd/cxx/tree/stream-extraction-source.cxx
index 91a1b3d..c2bbeb0 100644
--- a/xsd/cxx/tree/stream-extraction-source.cxx
+++ b/xsd/cxx/tree/stream-extraction-source.cxx
@@ -764,7 +764,7 @@ namespace CXX
Traversal::Schema schema;
- Traversal::Sources sources;
+ Sources sources;
Traversal::Names names_ns, names;
Namespace ns (ctx);
diff --git a/xsd/cxx/tree/stream-header.cxx b/xsd/cxx/tree/stream-header.cxx
index 7004e20..76c1ac9 100644
--- a/xsd/cxx/tree/stream-header.cxx
+++ b/xsd/cxx/tree/stream-header.cxx
@@ -159,7 +159,7 @@ namespace CXX
Traversal::Schema schema;
- Traversal::Sources sources;
+ Sources sources;
Traversal::Names names_ns, names;
Namespace ns (ctx);
diff --git a/xsd/cxx/tree/stream-insertion-header.cxx b/xsd/cxx/tree/stream-insertion-header.cxx
index 8fc3933..8d00eb0 100644
--- a/xsd/cxx/tree/stream-insertion-header.cxx
+++ b/xsd/cxx/tree/stream-insertion-header.cxx
@@ -154,7 +154,7 @@ namespace CXX
Traversal::Schema schema;
- Traversal::Sources sources;
+ Sources sources;
Traversal::Names names_ns, names;
Namespace ns (ctx);
diff --git a/xsd/cxx/tree/stream-insertion-source.cxx b/xsd/cxx/tree/stream-insertion-source.cxx
index ee98f96..9af8a33 100644
--- a/xsd/cxx/tree/stream-insertion-source.cxx
+++ b/xsd/cxx/tree/stream-insertion-source.cxx
@@ -538,7 +538,7 @@ namespace CXX
Traversal::Schema schema;
- Traversal::Sources sources;
+ Sources sources;
Traversal::Names names_ns, names;
Namespace ns (ctx);
diff --git a/xsd/cxx/tree/stream-source.cxx b/xsd/cxx/tree/stream-source.cxx
index bdbf989..7c4954c 100644
--- a/xsd/cxx/tree/stream-source.cxx
+++ b/xsd/cxx/tree/stream-source.cxx
@@ -465,7 +465,7 @@ namespace CXX
Traversal::Schema schema;
- Traversal::Sources sources;
+ Sources sources;
Traversal::Names names_ns, names;
Namespace ns (ctx, first, last);
diff --git a/xsd/cxx/tree/tree-forward.cxx b/xsd/cxx/tree/tree-forward.cxx
index dd6d444..2c6ad1b 100644
--- a/xsd/cxx/tree/tree-forward.cxx
+++ b/xsd/cxx/tree/tree-forward.cxx
@@ -302,7 +302,7 @@ namespace CXX
<< "//" << endl;
Traversal::Schema schema;
- Traversal::Sources sources;
+ Sources sources;
Traversal::Names names_ns, names;
Namespace ns (ctx);
diff --git a/xsd/cxx/tree/tree-header.cxx b/xsd/cxx/tree/tree-header.cxx
index ed9ab60..e02e768 100644
--- a/xsd/cxx/tree/tree-header.cxx
+++ b/xsd/cxx/tree/tree-header.cxx
@@ -3869,7 +3869,7 @@ namespace CXX
{
Traversal::Schema schema;
- Traversal::Sources sources;
+ Sources sources;
Traversal::Names names_ns, names;
DocumentedNamespace ns (ctx);
diff --git a/xsd/cxx/tree/tree-inline.cxx b/xsd/cxx/tree/tree-inline.cxx
index 431bc0a..45a62e1 100644
--- a/xsd/cxx/tree/tree-inline.cxx
+++ b/xsd/cxx/tree/tree-inline.cxx
@@ -1035,7 +1035,7 @@ namespace CXX
}
Traversal::Schema schema;
- Traversal::Sources sources;
+ Sources sources;
Traversal::Names names_ns, names;
Namespace ns (ctx, first, last);
diff --git a/xsd/cxx/tree/tree-source.cxx b/xsd/cxx/tree/tree-source.cxx
index c972357..d322027 100644
--- a/xsd/cxx/tree/tree-source.cxx
+++ b/xsd/cxx/tree/tree-source.cxx
@@ -3518,7 +3518,7 @@ namespace CXX
}
Traversal::Schema schema;
- Traversal::Sources sources;
+ Sources sources;
Traversal::Names names_ns, names;
Namespace ns (ctx, first, last);
diff --git a/xsd/cxx/tree/validator.cxx b/xsd/cxx/tree/validator.cxx
index 00ec7f9..1fc29ca 100644
--- a/xsd/cxx/tree/validator.cxx
+++ b/xsd/cxx/tree/validator.cxx
@@ -401,7 +401,7 @@ namespace CXX
private:
Containers::Set<String> types_;
- Traversal::Sources sources_;
+ Sources sources_;
Traversal::Names schema_names_;
Traversal::Namespace ns_;
@@ -512,7 +512,7 @@ namespace CXX
Containers::Set<String> types_;
- Traversal::Sources sources_;
+ Sources sources_;
Traversal::Names schema_names_;
Traversal::Namespace ns_;