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/parser/elements.cxx       | 56 +++++++++++++++++++--------------------
 xsd/cxx/parser/name-processor.cxx |  6 -----
 xsd/cxx/parser/name-processor.hxx |  2 --
 xsd/cxx/parser/type-processor.cxx |  6 -----
 xsd/cxx/parser/type-processor.hxx |  2 --
 xsd/cxx/parser/validator.cxx      |  6 -----
 xsd/cxx/parser/validator.hxx      |  2 --
 7 files changed, 27 insertions(+), 53 deletions(-)

(limited to 'xsd/cxx/parser')

diff --git a/xsd/cxx/parser/elements.cxx b/xsd/cxx/parser/elements.cxx
index bd610a3..af68568 100644
--- a/xsd/cxx/parser/elements.cxx
+++ b/xsd/cxx/parser/elements.cxx
@@ -9,35 +9,6 @@ namespace CXX
 {
   namespace Parser
   {
-    // Keep this symbol first to help HP-UX linker (long symbols?).
-    //
-    Content::Value Context::
-    content (SemanticGraph::Complex& c)
-    {
-      using namespace SemanticGraph;
-
-      if (c.mixed_p ())
-        return Content::mixed;
-
-      if (c.inherits_p ())
-      {
-        Type& base (c.inherits ().base ());
-
-        if (Complex* cb = dynamic_cast<Complex*> (&base))
-          return content (*cb);
-
-        if (base.is_a<AnyType> ())
-          return Content::complex;
-
-        // Everyhting else (built-in type and AnySimpleType) is simple
-        // content.
-        //
-        return Content::simple;
-      }
-      else
-        return Content::complex;
-    }
-
     Context::
     Context (std::wostream& o,
              SemanticGraph::Schema& root,
@@ -129,6 +100,33 @@ namespace CXX
     {
     }
 
+    Content::Value Context::
+    content (SemanticGraph::Complex& c)
+    {
+      using namespace SemanticGraph;
+
+      if (c.mixed_p ())
+        return Content::mixed;
+
+      if (c.inherits_p ())
+      {
+        Type& base (c.inherits ().base ());
+
+        if (Complex* cb = dynamic_cast<Complex*> (&base))
+          return content (*cb);
+
+        if (base.is_a<AnyType> ())
+          return Content::complex;
+
+        // Everyhting else (built-in type and AnySimpleType) is simple
+        // content.
+        //
+        return Content::simple;
+      }
+      else
+        return Content::complex;
+    }
+
     bool Context::
     anonymous (SemanticGraph::Type& t)
     {
diff --git a/xsd/cxx/parser/name-processor.cxx b/xsd/cxx/parser/name-processor.cxx
index 7cd959c..70e8281 100644
--- a/xsd/cxx/parser/name-processor.cxx
+++ b/xsd/cxx/parser/name-processor.cxx
@@ -20,12 +20,6 @@ namespace CXX
 {
   namespace Parser
   {
-    NameProcessor::
-    NameProcessor ()
-    {
-      // Dummy ctor, helps with long symbols on HP-UX.
-    }
-
     namespace
     {
       //
diff --git a/xsd/cxx/parser/name-processor.hxx b/xsd/cxx/parser/name-processor.hxx
index a6c41ff..26f27e6 100644
--- a/xsd/cxx/parser/name-processor.hxx
+++ b/xsd/cxx/parser/name-processor.hxx
@@ -20,8 +20,6 @@ namespace CXX
     class NameProcessor
     {
     public:
-      NameProcessor (); // Dummy ctor, helps with long symbols on HP-UX.
-
       void
       process (options const&,
                XSDFrontend::SemanticGraph::Schema&,
diff --git a/xsd/cxx/parser/type-processor.cxx b/xsd/cxx/parser/type-processor.cxx
index fa60b3c..4cfa458 100644
--- a/xsd/cxx/parser/type-processor.cxx
+++ b/xsd/cxx/parser/type-processor.cxx
@@ -17,12 +17,6 @@ namespace CXX
 {
   namespace Parser
   {
-    TypeProcessor::
-    TypeProcessor ()
-    {
-      // Dummy ctor, helps with long symbols on HP-UX.
-    }
-
     namespace
     {
       //
diff --git a/xsd/cxx/parser/type-processor.hxx b/xsd/cxx/parser/type-processor.hxx
index 2889138..77e8636 100644
--- a/xsd/cxx/parser/type-processor.hxx
+++ b/xsd/cxx/parser/type-processor.hxx
@@ -21,8 +21,6 @@ namespace CXX
     class TypeProcessor
     {
     public:
-      TypeProcessor (); // Dummy ctor, helps with long symbols on HP-UX.
-
       void
       process (options const&,
                XSDFrontend::SemanticGraph::Schema&,
diff --git a/xsd/cxx/parser/validator.cxx b/xsd/cxx/parser/validator.cxx
index e808e27..e84996e 100644
--- a/xsd/cxx/parser/validator.cxx
+++ b/xsd/cxx/parser/validator.cxx
@@ -545,12 +545,6 @@ namespace CXX
 
     }
 
-    Validator::
-    Validator ()
-    {
-      // Dummy ctor, helps with long symbols on HP-UX.
-    }
-
     bool Validator::
     validate (options const& ops,
               SemanticGraph::Schema& root,
diff --git a/xsd/cxx/parser/validator.hxx b/xsd/cxx/parser/validator.hxx
index 036e38c..e5172c2 100644
--- a/xsd/cxx/parser/validator.hxx
+++ b/xsd/cxx/parser/validator.hxx
@@ -19,8 +19,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