From 366503ddde486f1674194dc0b7015c01f8de70cc Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Thu, 14 Nov 2013 12:18:10 +0200
Subject: Get rid of long symbol workaround for HP-UX

---
 xsd/cxx/tree/counter.cxx        |  5 -----
 xsd/cxx/tree/counter.hxx        |  2 --
 xsd/cxx/tree/elements.cxx       | 44 ++++++++++++++++++++---------------------
 xsd/cxx/tree/name-processor.cxx |  6 ------
 xsd/cxx/tree/name-processor.hxx |  2 --
 xsd/cxx/tree/validator.cxx      |  6 ------
 xsd/cxx/tree/validator.hxx      |  2 --
 7 files changed, 22 insertions(+), 45 deletions(-)

(limited to 'xsd/cxx/tree')

diff --git a/xsd/cxx/tree/counter.cxx b/xsd/cxx/tree/counter.cxx
index 40a7c61..58bd22d 100644
--- a/xsd/cxx/tree/counter.cxx
+++ b/xsd/cxx/tree/counter.cxx
@@ -230,11 +230,6 @@ namespace CXX
       };
     }
 
-    Counter::
-    Counter ()
-    {
-    }
-
     Counts Counter::
     count (options const& ops,
            SemanticGraph::Schema& tu,
diff --git a/xsd/cxx/tree/counter.hxx b/xsd/cxx/tree/counter.hxx
index 7c91068..e274891 100644
--- a/xsd/cxx/tree/counter.hxx
+++ b/xsd/cxx/tree/counter.hxx
@@ -16,8 +16,6 @@ namespace CXX
     class Counter
     {
     public:
-      Counter (); // Dummy ctor, helps with long symbols on HP-UX.
-
       Counts
       count (options const&,
              SemanticGraph::Schema&,
diff --git a/xsd/cxx/tree/elements.cxx b/xsd/cxx/tree/elements.cxx
index 5fdee30..8021287 100644
--- a/xsd/cxx/tree/elements.cxx
+++ b/xsd/cxx/tree/elements.cxx
@@ -11,28 +11,6 @@ namespace CXX
   {
     // Context
     //
-    void Context::
-    update_ns_scope () // Keeping this function first helps HP-UX
-    {                  // (long symbols).
-      ns_scope.clear ();
-
-      bool first (true);
-
-      for (NamespaceStack::iterator i (ns_scope_stack.begin ());
-           i != ns_scope_stack.end ();
-           ++i)
-      {
-        // We only qualify names until the namespace level.
-        //
-        if (first)
-          first = false;
-        else
-          ns_scope += L"::";
-
-        ns_scope += *i;
-      }
-    }
-
     Context::
     Context (std::wostream& o,
              SemanticGraph::Schema& root,
@@ -366,6 +344,28 @@ namespace CXX
     {
     }
 
+    void Context::
+    update_ns_scope ()
+    {
+      ns_scope.clear ();
+
+      bool first (true);
+
+      for (NamespaceStack::iterator i (ns_scope_stack.begin ());
+           i != ns_scope_stack.end ();
+           ++i)
+      {
+        // We only qualify names until the namespace level.
+        //
+        if (first)
+          first = false;
+        else
+          ns_scope += L"::";
+
+        ns_scope += *i;
+      }
+    }
+
     bool Context::
     custom_type (SemanticGraph::Type const& t, String& r) const
     {
diff --git a/xsd/cxx/tree/name-processor.cxx b/xsd/cxx/tree/name-processor.cxx
index 1e21bab..844d8e1 100644
--- a/xsd/cxx/tree/name-processor.cxx
+++ b/xsd/cxx/tree/name-processor.cxx
@@ -20,12 +20,6 @@ namespace CXX
 {
   namespace Tree
   {
-    NameProcessor::
-    NameProcessor ()
-    {
-      // Dummy ctor, helps with long symbols on HP-UX.
-    }
-
     namespace
     {
       //
diff --git a/xsd/cxx/tree/name-processor.hxx b/xsd/cxx/tree/name-processor.hxx
index 8026a3d..c8505c7 100644
--- a/xsd/cxx/tree/name-processor.hxx
+++ b/xsd/cxx/tree/name-processor.hxx
@@ -18,8 +18,6 @@ namespace CXX
     class NameProcessor
     {
     public:
-      NameProcessor (); // Dummy ctor, helps with long symbols on HP-UX.
-
       bool
       process (options const&,
                XSDFrontend::SemanticGraph::Schema&,
diff --git a/xsd/cxx/tree/validator.cxx b/xsd/cxx/tree/validator.cxx
index 32aaeb0..4b8da17 100644
--- a/xsd/cxx/tree/validator.cxx
+++ b/xsd/cxx/tree/validator.cxx
@@ -520,12 +520,6 @@ namespace CXX
       };
     }
 
-    Validator::
-    Validator ()
-    {
-      // Dummy ctor, helps with long symbols on HP-UX.
-    }
-
     bool Validator::
     validate (options const& ops,
               SemanticGraph::Schema& schema,
diff --git a/xsd/cxx/tree/validator.hxx b/xsd/cxx/tree/validator.hxx
index f79adcb..ace8abe 100644
--- a/xsd/cxx/tree/validator.hxx
+++ b/xsd/cxx/tree/validator.hxx
@@ -18,8 +18,6 @@ namespace CXX
     class Validator
     {
     public:
-      Validator (); // Dummy ctor, helps with long symbols on HP-UX.
-
       bool
       validate (options const&,
                 SemanticGraph::Schema&,
-- 
cgit v1.1