Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-01 06:01:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove circular include between core/typedefs.h and core/error_macros.h

Browse source
This commit is contained in:
Marcel Admiraal 2019-10-08 10:17:11 +02:00
parent 98497ff719
commit c2aa3e2351
8 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
core/cowdata.h
View file

@ -33,6 +33,7 @@
#include <string.h> #include <string.h>
#include "core/error_macros.h"
#include "core/os/memory.h" #include "core/os/memory.h"
#include "core/safe_refcount.h" #include "core/safe_refcount.h"

1
core/list.h
View file

@ -31,6 +31,7 @@
#ifndef GLOBALS_LIST_H #ifndef GLOBALS_LIST_H
#define GLOBALS_LIST_H #define GLOBALS_LIST_H
#include "core/error_macros.h"
#include "core/os/memory.h" #include "core/os/memory.h"
#include "core/sort_array.h" #include "core/sort_array.h"

1
core/map.h
View file

@ -31,6 +31,7 @@
#ifndef MAP_H #ifndef MAP_H
#define MAP_H #define MAP_H
#include "core/error_macros.h"
#include "core/set.h" #include "core/set.h"
// based on the very nice implementation of rb-trees by: // based on the very nice implementation of rb-trees by:

2
core/math/math_funcs.cpp
View file

@ -30,6 +30,8 @@
#include "math_funcs.h" #include "math_funcs.h"
#include "core/error_macros.h"
RandomPCG Math::default_rand(RandomPCG::DEFAULT_SEED, RandomPCG::DEFAULT_INC); RandomPCG Math::default_rand(RandomPCG::DEFAULT_SEED, RandomPCG::DEFAULT_INC);
#define PHI 0x9e3779b9 #define PHI 0x9e3779b9

1
core/os/memory.h
View file

@ -31,6 +31,7 @@
#ifndef MEMORY_H #ifndef MEMORY_H
#define MEMORY_H #define MEMORY_H
#include "core/error_macros.h"
#include "core/safe_refcount.h" #include "core/safe_refcount.h"
#include <stddef.h> #include <stddef.h>

1
core/self_list.h
View file

@ -31,6 +31,7 @@
#ifndef SELF_LIST_H #ifndef SELF_LIST_H
#define SELF_LIST_H #define SELF_LIST_H
#include "core/error_macros.h"
#include "core/typedefs.h" #include "core/typedefs.h"
template <class T> template <class T>

1
core/sort_array.h
View file

@ -31,6 +31,7 @@
#ifndef SORT_ARRAY_H #ifndef SORT_ARRAY_H
#define SORT_ARRAY_H #define SORT_ARRAY_H
#include "core/error_macros.h"
#include "core/typedefs.h" #include "core/typedefs.h"
#define ERR_BAD_COMPARE(cond) \ #define ERR_BAD_COMPARE(cond) \

1
core/typedefs.h
View file

@ -108,7 +108,6 @@ T *_nullptr() {
#include "core/int_types.h" #include "core/int_types.h"
#include "core/error_list.h" #include "core/error_list.h"
#include "core/error_macros.h"
/** Generic ABS function, for math uses please use Math::abs */ /** Generic ABS function, for math uses please use Math::abs */