Remove Core.h include from DataDefs.h

Core.h isn't required for DataDefs.h which removes Core.h dependency
from DataStatics*.
develop
Pauli 2018-07-07 13:27:29 +03:00 committed by lethosor
parent 315852a251
commit f0632347d0
11 changed files with 19 additions and 1 deletions

@ -1,3 +1,4 @@
#include "Core.h"
#include "Internal.h" #include "Internal.h"
#include "DataDefs.h" #include "DataDefs.h"
#include "MiscUtils.h" #include "MiscUtils.h"

@ -1,5 +1,7 @@
#include <stddef.h> #include <stddef.h>
#include <fstream>
#ifndef STATIC_FIELDS_GROUP #ifndef STATIC_FIELDS_GROUP
#include "DataDefs.h" #include "DataDefs.h"
#endif #endif

@ -26,6 +26,7 @@ distribution.
#include "TileTypes.h" #include "TileTypes.h"
#include "Export.h" #include "Export.h"
#include <cassert>
#include <map> #include <map>
using namespace DFHack; using namespace DFHack;

@ -32,7 +32,6 @@ distribution.
#include <utility> #include <utility>
#include <vector> #include <vector>
#include "Core.h"
#include "BitArray.h" #include "BitArray.h"
// Stop some MS stupidity // Stop some MS stupidity
@ -48,6 +47,7 @@ typedef struct lua_State lua_State;
namespace DFHack namespace DFHack
{ {
class Core;
class virtual_class {}; class virtual_class {};
enum identity_type { enum identity_type {

@ -32,6 +32,10 @@ distribution.
#include "DataIdentity.h" #include "DataIdentity.h"
#include "LuaWrapper.h" #include "LuaWrapper.h"
namespace DFHack {
class color_ostream;
}
namespace df { namespace df {
// A very simple and stupid implementation of some stuff from boost // A very simple and stupid implementation of some stuff from boost
template<class U, class V> struct is_same_type { static const bool value = false; }; template<class U, class V> struct is_same_type { static const bool value = false; };

@ -24,6 +24,7 @@ distribution.
#pragma once #pragma once
#include <deque>
#include <string> #include <string>
#include <sstream> #include <sstream>
#include <vector> #include <vector>

@ -30,6 +30,7 @@ distribution.
#include <map> #include <map>
#include <type_traits> #include <type_traits>
#include "ColorText.h"
#include "DataDefs.h" #include "DataDefs.h"
#include <lua.h> #include <lua.h>

@ -53,6 +53,9 @@ namespace df
namespace DFHack namespace DFHack
{ {
class color_ostream;
namespace Buildings namespace Buildings
{ {
/** /**

@ -47,6 +47,8 @@ namespace df
namespace DFHack namespace DFHack
{ {
class color_ostream;
namespace Job { namespace Job {
// Duplicate the job structure. It is not linked into any DF lists. // Duplicate the job structure. It is not linked into any DF lists.
DFHACK_EXPORT df::job *cloneJobStruct(df::job *job, bool keepEverything=false); DFHACK_EXPORT df::job *cloneJobStruct(df::job *job, bool keepEverything=false);

@ -2,6 +2,7 @@
#include <modules/Gui.h> #include <modules/Gui.h>
#include "Core.h"
#include "DataDefs.h" #include "DataDefs.h"
#include "df/biome_type.h" #include "df/biome_type.h"
#include "df/inorganic_raw.h" #include "df/inorganic_raw.h"

@ -30,6 +30,8 @@
// protobuf // protobuf
#include <google/protobuf/io/zero_copy_stream_impl.h> #include <google/protobuf/io/zero_copy_stream_impl.h>
#include <fstream>
using std::endl; using std::endl;
using namespace DFHack; using namespace DFHack;
using namespace df::enums; using namespace df::enums;