From 4e51c7d4f0cc22441716389845d10ab36c09bf42 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Thu, 17 Jul 2014 08:35:07 +0200
Subject: Generate forward file include earlier

We need to get all the configuration defines (e.g., CXX11) before we
include any runtime headers.
---
 xsd/cxx/tree/generator.cxx | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

(limited to 'xsd')

diff --git a/xsd/cxx/tree/generator.cxx b/xsd/cxx/tree/generator.cxx
index f7eb1fa..7a413bd 100644
--- a/xsd/cxx/tree/generator.cxx
+++ b/xsd/cxx/tree/generator.cxx
@@ -870,6 +870,14 @@ namespace CXX
                 << endl;
           }
         }
+        else if (!generate_xml_schema)
+        {
+          // Generate it before the prologue so that we get the above
+          // defines.
+          //
+          hxx << "#include " << ctx.process_include_path (fwd_name)
+              << endl << endl;
+        }
 
         // Copy prologue.
         //
@@ -900,14 +908,8 @@ namespace CXX
         {
           ind_filter ind (hxx); // We don't want to indent prologues/epilogues.
 
-          if (!generate_xml_schema)
-          {
-            if (forward)
-              hxx << "#include " << ctx.process_include_path (fwd_name)
-                  << endl << endl;
-            else
-              generate_forward (ctx);
-          }
+          if (!generate_xml_schema && !forward)
+            generate_forward (ctx);
 
           generate_tree_header (ctx);
 
-- 
cgit v1.1