diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-10-08 15:39:05 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-08 15:39:05 +0200 |
| commit | 2078dcbe15e7b1a25bc06b0834a007d63c7ccd01 (patch) | |
| tree | 2d899968d8da21a660363f37544af23c578fc26b | |
| parent | 76ef250d09a4a44f3a57d1a75b5c4c9cd010b782 (diff) | |
| parent | c2aa3e2351c3a7eec912ce8f06fe8e9f72f6605c (diff) | |
Merge pull request #32640 from madmiraal/remove-circular-includes
Remove circular include between core/typedefs.h and core/error_macros.h
| -rw-r--r-- | core/cowdata.h | 1 | ||||
| -rw-r--r-- | core/list.h | 1 | ||||
| -rw-r--r-- | core/map.h | 1 | ||||
| -rw-r--r-- | core/math/math_funcs.cpp | 2 | ||||
| -rw-r--r-- | core/os/memory.h | 1 | ||||
| -rw-r--r-- | core/self_list.h | 1 | ||||
| -rw-r--r-- | core/sort_array.h | 1 | ||||
| -rw-r--r-- | core/typedefs.h | 1 |
8 files changed, 8 insertions, 1 deletions
diff --git a/core/cowdata.h b/core/cowdata.h index 3e40ad0f4b..c92e20920c 100644 --- a/core/cowdata.h +++ b/core/cowdata.h @@ -33,6 +33,7 @@ #include <string.h> +#include "core/error_macros.h" #include "core/os/memory.h" #include "core/safe_refcount.h" diff --git a/core/list.h b/core/list.h index d1b528562d..c46888e01c 100644 --- a/core/list.h +++ b/core/list.h @@ -31,6 +31,7 @@ #ifndef GLOBALS_LIST_H #define GLOBALS_LIST_H +#include "core/error_macros.h" #include "core/os/memory.h" #include "core/sort_array.h" diff --git a/core/map.h b/core/map.h index c87ee42e1b..77e73d70cb 100644 --- a/core/map.h +++ b/core/map.h @@ -31,6 +31,7 @@ #ifndef MAP_H #define MAP_H +#include "core/error_macros.h" #include "core/set.h" // based on the very nice implementation of rb-trees by: diff --git a/core/math/math_funcs.cpp b/core/math/math_funcs.cpp index f04e40cb6c..50fcdb2c13 100644 --- a/core/math/math_funcs.cpp +++ b/core/math/math_funcs.cpp @@ -30,6 +30,8 @@ #include "math_funcs.h" +#include "core/error_macros.h" + RandomPCG Math::default_rand(RandomPCG::DEFAULT_SEED, RandomPCG::DEFAULT_INC); #define PHI 0x9e3779b9 diff --git a/core/os/memory.h b/core/os/memory.h index 8778cb63ad..a68a359546 100644 --- a/core/os/memory.h +++ b/core/os/memory.h @@ -31,6 +31,7 @@ #ifndef MEMORY_H #define MEMORY_H +#include "core/error_macros.h" #include "core/safe_refcount.h" #include <stddef.h> diff --git a/core/self_list.h b/core/self_list.h index 314d440977..07abcd1d53 100644 --- a/core/self_list.h +++ b/core/self_list.h @@ -31,6 +31,7 @@ #ifndef SELF_LIST_H #define SELF_LIST_H +#include "core/error_macros.h" #include "core/typedefs.h" template <class T> diff --git a/core/sort_array.h b/core/sort_array.h index 8660ee3333..d330e0c647 100644 --- a/core/sort_array.h +++ b/core/sort_array.h @@ -31,6 +31,7 @@ #ifndef SORT_ARRAY_H #define SORT_ARRAY_H +#include "core/error_macros.h" #include "core/typedefs.h" #define ERR_BAD_COMPARE(cond) \ diff --git a/core/typedefs.h b/core/typedefs.h index 660139b90a..767a97ac38 100644 --- a/core/typedefs.h +++ b/core/typedefs.h @@ -108,7 +108,6 @@ T *_nullptr() { #include "core/int_types.h" #include "core/error_list.h" -#include "core/error_macros.h" /** Generic ABS function, for math uses please use Math::abs */ |