From 2ff19bd5b0ab8bb13a94177ca6c172ae42e7d534 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Sat, 1 Mar 2014 08:34:32 +0200
Subject: Move pro/epilogue outside pre/post.hxx includes

Also add pre/post includes to the C++/Parser source file.
---
 xsd/cxx/parser/generator.cxx | 36 +++++++++++++++++++++---------------
 1 file changed, 21 insertions(+), 15 deletions(-)

(limited to 'xsd/cxx/parser')

diff --git a/xsd/cxx/parser/generator.cxx b/xsd/cxx/parser/generator.cxx
index 46a0687..58e7043 100644
--- a/xsd/cxx/parser/generator.cxx
+++ b/xsd/cxx/parser/generator.cxx
@@ -787,18 +787,6 @@ namespace CXX
               << endl;
         }
 
-        // Version check.
-        //
-        hxx << "#include <xsd/cxx/config.hxx>" << endl
-            << endl
-            << "#if (XSD_INT_VERSION != " << XSD_INT_VERSION << "L)" << endl
-            << "#error XSD runtime version mismatch" << endl
-            << "#endif" << endl
-            << endl;
-
-        hxx << "#include <xsd/cxx/pre.hxx>" << endl
-            << endl;
-
         // Copy prologue.
         //
         hxx << "// Begin prologue." << endl
@@ -811,6 +799,18 @@ namespace CXX
             << "// End prologue." << endl
             << endl;
 
+        // Version check.
+        //
+        hxx << "#include <xsd/cxx/config.hxx>" << endl
+            << endl
+            << "#if (XSD_INT_VERSION != " << XSD_INT_VERSION << "L)" << endl
+            << "#error XSD runtime version mismatch" << endl
+            << "#endif" << endl
+            << endl;
+
+        hxx << "#include <xsd/cxx/pre.hxx>" << endl
+            << endl;
+
         // Generate.
         //
         {
@@ -825,6 +825,9 @@ namespace CXX
         if (inline_)
           hxx << "#include " << ctx.process_include_path (ixx_name) << endl;
 
+        hxx << "#include <xsd/cxx/post.hxx>" << endl
+            << endl;
+
         // Copy epilogue.
         //
         hxx << "// Begin epilogue." << endl
@@ -837,9 +840,6 @@ namespace CXX
             << "// End epilogue." << endl
             << endl;
 
-        hxx << "#include <xsd/cxx/post.hxx>" << endl
-            << endl;
-
         hxx << "#endif // " << guard << endl;
 
         if (show_sloc)
@@ -929,6 +929,9 @@ namespace CXX
             << "// End prologue." << endl
             << endl;
 
+        cxx << "#include <xsd/cxx/pre.hxx>" << endl
+             << endl;
+
         cxx << "#include " << ctx.process_include_path (hxx_name) << endl
             << endl;
 
@@ -950,6 +953,9 @@ namespace CXX
           }
         }
 
+        cxx << "#include <xsd/cxx/post.hxx>" << endl
+            << endl;
+
         // Copy epilogue.
         //
         cxx << "// Begin epilogue." << endl
-- 
cgit v1.1