From f2723d0d78b532a9847d3448237d0ce3f789d2e7 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Thu, 30 May 2013 19:14:29 -0400
Subject: Use more specific name to work around ambiguity

---
 xsde/cxx/hybrid/elements.hxx | 48 ++++++++++++++++++++++----------------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/xsde/cxx/hybrid/elements.hxx b/xsde/cxx/hybrid/elements.hxx
index a1fb22e..53f8485 100644
--- a/xsde/cxx/hybrid/elements.hxx
+++ b/xsde/cxx/hybrid/elements.hxx
@@ -1688,7 +1688,7 @@ namespace CXX
       virtual void
       traverse (SemanticGraph::Type& t)
       {
-        type (t);
+        general_type (t);
       }
 
       // anyType & anySimpleType.
@@ -1696,7 +1696,7 @@ namespace CXX
       virtual void
       traverse (SemanticGraph::AnyType& t)
       {
-        type (t);
+        general_type (t);
       }
 
       virtual void
@@ -1842,7 +1842,7 @@ namespace CXX
       virtual void
       traverse (SemanticGraph::Fundamental::NameTokens& t)
       {
-        type (t);
+        general_type (t);
       }
 
       virtual void
@@ -1868,7 +1868,7 @@ namespace CXX
       virtual void
       traverse (SemanticGraph::Fundamental::QName& t)
       {
-        type (t);
+        general_type (t);
       }
 
       // ID/IDREF.
@@ -1888,7 +1888,7 @@ namespace CXX
       virtual void
       traverse (SemanticGraph::Fundamental::IdRefs& t)
       {
-        type (t);
+        general_type (t);
       }
 
       // URI.
@@ -1904,13 +1904,13 @@ namespace CXX
       virtual void
       traverse (SemanticGraph::Fundamental::Base64Binary& t)
       {
-        type (t);
+        general_type (t);
       }
 
       virtual void
       traverse (SemanticGraph::Fundamental::HexBinary& t)
       {
-        type (t);
+        general_type (t);
       }
 
       // Date/time.
@@ -1918,55 +1918,55 @@ namespace CXX
       virtual void
       traverse (SemanticGraph::Fundamental::Date& t)
       {
-        type (t);
+        general_type (t);
       }
 
       virtual void
       traverse (SemanticGraph::Fundamental::DateTime& t)
       {
-        type (t);
+        general_type (t);
       }
 
       virtual void
       traverse (SemanticGraph::Fundamental::Duration& t)
       {
-        type (t);
+        general_type (t);
       }
 
       virtual void
       traverse (SemanticGraph::Fundamental::Day& t)
       {
-        type (t);
+        general_type (t);
       }
 
       virtual void
       traverse (SemanticGraph::Fundamental::Month& t)
       {
-        type (t);
+        general_type (t);
       }
 
       virtual void
       traverse (SemanticGraph::Fundamental::MonthDay& t)
       {
-        type (t);
+        general_type (t);
       }
 
       virtual void
       traverse (SemanticGraph::Fundamental::Year& t)
       {
-        type (t);
+        general_type (t);
       }
 
       virtual void
       traverse (SemanticGraph::Fundamental::YearMonth& t)
       {
-        type (t);
+        general_type (t);
       }
 
       virtual void
       traverse (SemanticGraph::Fundamental::Time& t)
       {
-        type (t);
+        general_type (t);
       }
 
       // Entity.
@@ -1980,12 +1980,12 @@ namespace CXX
       virtual void
       traverse (SemanticGraph::Fundamental::Entities& t)
       {
-        type (t);
+        general_type (t);
       }
 
     protected:
       virtual void
-      type (SemanticGraph::Type&) = 0;
+      general_type (SemanticGraph::Type&) = 0;
 
       virtual void
       fund_type (SemanticGraph::Type&) = 0;
@@ -2003,7 +2003,7 @@ namespace CXX
 
     protected:
       virtual void
-      type (SemanticGraph::Type& t)
+      general_type (SemanticGraph::Type& t)
       {
         if (!fixed_length (t))
           os << "*";
@@ -2036,7 +2036,7 @@ namespace CXX
 
     protected:
       virtual void
-      type (SemanticGraph::Type& t)
+      general_type (SemanticGraph::Type& t)
       {
         if (!custom_alloc)
           os << "delete " << var_ << ";";
@@ -2054,14 +2054,14 @@ namespace CXX
       virtual void
       fund_type (SemanticGraph::Type& t)
       {
-        type (t);
+        general_type (t);
       }
 
       virtual void
       string_type (SemanticGraph::Type& t)
       {
         if (stl)
-          type (t);
+          general_type (t);
         else
         {
           if (!custom_alloc)
@@ -2095,7 +2095,7 @@ namespace CXX
 
     protected:
       virtual void
-      type (SemanticGraph::Type& t)
+      general_type (SemanticGraph::Type& t)
       {
         String const& name (ename (*member_));
 
@@ -2115,7 +2115,7 @@ namespace CXX
       virtual void
       fund_type (SemanticGraph::Type& t)
       {
-        type (t);
+        general_type (t);
       }
 
       virtual void
-- 
cgit v1.1