From f0a4f34da1418cf299cf9f41a772f513b180e2cf Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Thu, 14 Oct 2010 12:27:37 +0200
Subject: Move prologue/epilogue inside pre/post includes

---
 xsd/cxx/parser/generator.cxx | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

(limited to 'xsd/cxx/parser/generator.cxx')

diff --git a/xsd/cxx/parser/generator.cxx b/xsd/cxx/parser/generator.cxx
index 617ff4f..2ce958f 100644
--- a/xsd/cxx/parser/generator.cxx
+++ b/xsd/cxx/parser/generator.cxx
@@ -1195,6 +1195,18 @@ namespace CXX
             << "#define " << guard << 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;
+
         // Copy prologue.
         //
         hxx << "// Begin prologue." << endl
@@ -1208,19 +1220,7 @@ 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;
-
           // Set auto-indentation.
           //
           Indentation::Clip<Indentation::CXX, WideChar> hxx_clip (hxx);
@@ -1236,9 +1236,6 @@ namespace CXX
 
           if (inline_)
             hxx << "#include " << ctx.process_include_path (ixx_name) << endl;
-
-          hxx << "#include <xsd/cxx/post.hxx>" << endl
-              << endl;
         }
 
         // Copy epilogue.
@@ -1254,6 +1251,9 @@ namespace CXX
             << "// End epilogue." << endl
             << endl;
 
+        hxx << "#include <xsd/cxx/post.hxx>" << endl
+            << endl;
+
         hxx << "#endif // " << guard << endl;
 
         if (show_sloc)
-- 
cgit v1.1