Browse Source

[ERM] Less heavy includes in header

AlexVinS 11 years ago
parent
commit
febd4595dc
2 changed files with 18 additions and 16 deletions
  1. 15 0
      scripting/erm/ERMParser.cpp
  2. 3 16
      scripting/erm/ERMParser.h

+ 15 - 0
scripting/erm/ERMParser.cpp

@@ -1,6 +1,21 @@
 #include "StdInc.h"
 #include "ERMParser.h"
 
+
+#include <boost/spirit/include/qi.hpp>
+#include <boost/spirit/include/phoenix_core.hpp>
+#include <boost/spirit/include/phoenix_operator.hpp>
+#include <boost/spirit/include/phoenix_fusion.hpp>
+#include <boost/spirit/include/phoenix_stl.hpp>
+#include <boost/spirit/include/phoenix_object.hpp>
+#include <boost/fusion/include/adapt_struct.hpp>
+
+
+namespace qi = boost::spirit::qi;
+namespace ascii = spirit::ascii;
+namespace phoenix = boost::phoenix;
+
+
 /*
  * ERMParser.cpp, part of VCMI engine
  *

+ 3 - 16
scripting/erm/ERMParser.h

@@ -1,20 +1,4 @@
 #pragma once
-
-
-#include <boost/spirit/home/support/unused.hpp>
-#include <boost/spirit/include/qi.hpp>
-#include <boost/spirit/include/phoenix_core.hpp>
-#include <boost/spirit/include/phoenix_operator.hpp>
-#include <boost/spirit/include/phoenix_fusion.hpp>
-#include <boost/spirit/include/phoenix_stl.hpp>
-#include <boost/spirit/include/phoenix_object.hpp>
-#include <boost/fusion/include/adapt_struct.hpp>
-
-namespace spirit = boost::spirit;
-namespace qi = boost::spirit::qi;
-namespace ascii = spirit::ascii;
-namespace phoenix = boost::phoenix;
-
 /*
  * ERMParser.h, part of VCMI engine
  *
@@ -24,7 +8,10 @@ namespace phoenix = boost::phoenix;
  * Full text of license available in license.txt file, in main folder
  *
  */
+ 
+#include <boost/spirit/home/support/unused.hpp>
 
+namespace spirit = boost::spirit;
 
 class CERMPreprocessor
 {