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

Also add pre/post includes to all the source files.
---
 xsde/cxx/serializer/generator.cxx | 36 +++++++++++++++++++++---------------
 1 file changed, 21 insertions(+), 15 deletions(-)

(limited to 'xsde/cxx/serializer')

diff --git a/xsde/cxx/serializer/generator.cxx b/xsde/cxx/serializer/generator.cxx
index 94dcaec..6663708 100644
--- a/xsde/cxx/serializer/generator.cxx
+++ b/xsde/cxx/serializer/generator.cxx
@@ -773,6 +773,18 @@ namespace CXX
             << "#define " << guard << endl
             << endl;
 
+        // Copy prologue.
+        //
+        hxx << "// Begin prologue." << endl
+            << "//" << endl;
+
+        append (hxx, ops.hxx_prologue (), ops.prologue ());
+        append (hxx, ops.hxx_prologue_file (), prologue);
+
+        hxx << "//" << endl
+            << "// End prologue." << endl
+            << endl;
+
         // Version check.
         //
         hxx << "#include <xsde/cxx/version.hxx>" << endl
@@ -974,18 +986,6 @@ namespace CXX
         hxx << "#include <xsde/cxx/pre.hxx>" << endl
             << endl;
 
-        // Copy prologue.
-        //
-        hxx << "// Begin prologue." << endl
-            << "//" << endl;
-
-        append (hxx, ops.hxx_prologue (), ops.prologue ());
-        append (hxx, ops.hxx_prologue_file (), prologue);
-
-        hxx << "//" << endl
-            << "// End prologue." << endl
-            << endl;
-
         // Generate.
         //
         {
@@ -1001,6 +1001,9 @@ namespace CXX
           hxx << "#include " << ctx.process_include_path (ixx_name) << endl
               << endl;
 
+        hxx << "#include <xsde/cxx/post.hxx>" << endl
+            << endl;
+
         // Copy epilogue.
         //
         hxx << "// Begin epilogue." << endl
@@ -1013,9 +1016,6 @@ namespace CXX
             << "// End epilogue." << endl
             << endl;
 
-        hxx << "#include <xsde/cxx/post.hxx>" << endl
-            << endl;
-
         hxx << "#endif // " << guard << endl;
 
         if (show_sloc)
@@ -1093,6 +1093,9 @@ namespace CXX
             << "// End prologue." << endl
             << endl;
 
+        cxx << "#include <xsde/cxx/pre.hxx>" << endl
+            << endl;
+
         cxx << "#include " << ctx.process_include_path (hxx_name) << endl
             << endl;
 
@@ -1113,6 +1116,9 @@ namespace CXX
           }
         }
 
+        cxx << "#include <xsde/cxx/post.hxx>" << endl
+            << endl;
+
         // Copy epilogue.
         //
         cxx << "// Begin epilogue." << endl
-- 
cgit v1.1