From 818bcfa0dbbc1ef48bc3fe1f0c14d12866c51ef2 Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Sat, 19 Dec 2020 17:12:05 +0300
Subject: Various fixes

---
 xsd/xsd/cxx/tree/counter.cxx            | 20 +++++++++++---------
 xsd/xsd/cxx/tree/default-value.cxx      |  4 ++--
 xsd/xsd/cxx/tree/default-value.hxx      |  8 ++++++++
 xsd/xsd/cxx/tree/elements.hxx           |  4 ++++
 xsd/xsd/cxx/tree/fundamental-header.hxx |  2 ++
 xsd/xsd/cxx/tree/name-processor.cxx     |  2 ++
 xsd/xsd/cxx/tree/validator.cxx          |  5 +++++
 7 files changed, 34 insertions(+), 11 deletions(-)

(limited to 'xsd/xsd/cxx/tree')

diff --git a/xsd/xsd/cxx/tree/counter.cxx b/xsd/xsd/cxx/tree/counter.cxx
index 94bcc87..ac8db3b 100644
--- a/xsd/xsd/cxx/tree/counter.cxx
+++ b/xsd/xsd/cxx/tree/counter.cxx
@@ -241,18 +241,20 @@ namespace CXX
 
       schema >> sources >> schema;
 
-      Traversal::Names schema_names;
-      Traversal::Namespace ns;
-      Traversal::Names ns_names;
-      GlobalType global_type (ctx, counts);
-      GlobalElement global_element (ctx, counts);
+      {
+        Traversal::Names schema_names;
+        Traversal::Namespace ns;
+        Traversal::Names ns_names;
+        GlobalType global_type (ctx, counts);
+        GlobalElement global_element (ctx, counts);
 
-      schema >> schema_names >> ns >> ns_names;
+        schema >> schema_names >> ns >> ns_names;
 
-      ns_names >> global_element;
-      ns_names >> global_type;
+        ns_names >> global_element;
+        ns_names >> global_type;
 
-      schema.dispatch (tu);
+        schema.dispatch (tu);
+      }
 
       return counts;
     }
diff --git a/xsd/xsd/cxx/tree/default-value.cxx b/xsd/xsd/cxx/tree/default-value.cxx
index aefeda3..fd1c8c4 100644
--- a/xsd/xsd/cxx/tree/default-value.cxx
+++ b/xsd/xsd/cxx/tree/default-value.cxx
@@ -602,7 +602,7 @@ namespace CXX
     // Binary.
     //
     static unsigned char
-    base64_decode (unsigned char c)
+    base64_decode (wchar_t c)
     {
       unsigned char r = 0xFF;
 
@@ -800,7 +800,7 @@ namespace CXX
     }
 
     static unsigned char
-    hex_decode (unsigned char c)
+    hex_decode (wchar_t c)
     {
       unsigned char r = 0xFF;
 
diff --git a/xsd/xsd/cxx/tree/default-value.hxx b/xsd/xsd/cxx/tree/default-value.hxx
index 5485669..149982f 100644
--- a/xsd/xsd/cxx/tree/default-value.hxx
+++ b/xsd/xsd/cxx/tree/default-value.hxx
@@ -15,6 +15,8 @@ namespace CXX
   {
     struct IsLiteralValue: IsFundamentalType, Traversal::Complex
     {
+      using IsFundamentalType::traverse;
+
       IsLiteralValue (bool& r);
 
       virtual void
@@ -48,6 +50,9 @@ namespace CXX
 
                          Context
     {
+      using Traversal::NodeDispatcher::dispatch;
+      using Traversal::EdgeDispatcher::dispatch;
+
       LiteralValue (Context&);
 
       String
@@ -214,6 +219,9 @@ namespace CXX
 
                       Context
     {
+      using Traversal::NodeDispatcher::dispatch;
+      using Traversal::EdgeDispatcher::dispatch;
+
       InitValue (Context&);
 
       void
diff --git a/xsd/xsd/cxx/tree/elements.hxx b/xsd/xsd/cxx/tree/elements.hxx
index eba79dd..73c14b3 100644
--- a/xsd/xsd/cxx/tree/elements.hxx
+++ b/xsd/xsd/cxx/tree/elements.hxx
@@ -1616,6 +1616,8 @@ namespace CXX
                      Traversal::Attribute,
                      Context
     {
+      using Complex::traverse;
+
       // The second version outputs the argument name and stores
       // in in the base_arg string.
       //
@@ -1776,6 +1778,8 @@ namespace CXX
                                 Traversal::Attribute,
                                 Context
     {
+      using Complex::traverse;
+
       CtorArgsWithoutBase (Context& c, CtorArgType, bool arg, bool first);
 
       virtual void
diff --git a/xsd/xsd/cxx/tree/fundamental-header.hxx b/xsd/xsd/cxx/tree/fundamental-header.hxx
index a470154..0ea82cf 100644
--- a/xsd/xsd/cxx/tree/fundamental-header.hxx
+++ b/xsd/xsd/cxx/tree/fundamental-header.hxx
@@ -76,6 +76,8 @@ namespace CXX
                                   Traversal::Fundamental::Entities,
                                   Context
     {
+      using Namespace::traverse;
+
       FundamentalNamespace (Context& c)
           : DocumentedNamespace (c),
             Context (c),
diff --git a/xsd/xsd/cxx/tree/name-processor.cxx b/xsd/xsd/cxx/tree/name-processor.cxx
index e26a5d8..6ca616e 100644
--- a/xsd/xsd/cxx/tree/name-processor.cxx
+++ b/xsd/xsd/cxx/tree/name-processor.cxx
@@ -1808,6 +1808,8 @@ namespace CXX
 
                                    Context
       {
+        using Namespace::traverse;
+
         FundamentalNamespace (Context& c)
             : Context (c)
         {
diff --git a/xsd/xsd/cxx/tree/validator.cxx b/xsd/xsd/cxx/tree/validator.cxx
index dc6572c..46deb6c 100644
--- a/xsd/xsd/cxx/tree/validator.cxx
+++ b/xsd/xsd/cxx/tree/validator.cxx
@@ -274,6 +274,8 @@ namespace CXX
                         Traversal::Element,
                         ValidationContext
       {
+        using Schema::traverse;
+
         Traverser (ValidationContext& c)
             : ValidationContext (c), any_ (c)
         {
@@ -420,6 +422,9 @@ namespace CXX
                             Traversal::Attribute,
                             ValidationContext
       {
+        using Schema::traverse;
+        using Complex::traverse;
+
         AnonymousType (ValidationContext& c)
             : ValidationContext (c),
               anonymous_error_issued_ (false)
-- 
cgit v1.1