diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-04-14 15:48:28 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-14 15:48:28 +0200 |
| commit | 8ce0fb0a946455ed6a7bc8a54fcf90a9d5a9ae4d (patch) | |
| tree | e84160536d4bc1e69f6dae37bea2d58ad9a008a9 | |
| parent | 8fc4a732dee8b31130ad836de2847e909fb03871 (diff) | |
| parent | 1eaaf2f9a2811ffaca7ac914d26a3cac6a5e42e7 (diff) | |
Merge pull request #47886 from Pineapple/separate-set
Separate set.h from map.h
| -rw-r--r-- | core/io/file_access_pack.h | 1 | ||||
| -rw-r--r-- | core/templates/map.h | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/core/io/file_access_pack.h b/core/io/file_access_pack.h index 343adbe592..955108f455 100644 --- a/core/io/file_access_pack.h +++ b/core/io/file_access_pack.h @@ -36,6 +36,7 @@ #include "core/string/print_string.h" #include "core/templates/list.h" #include "core/templates/map.h" +#include "core/templates/set.h" // Godot's packed file magic header ("GDPC" in ASCII). #define PACK_HEADER_MAGIC 0x43504447 diff --git a/core/templates/map.h b/core/templates/map.h index 51a237472d..7dfee13d2c 100644 --- a/core/templates/map.h +++ b/core/templates/map.h @@ -32,7 +32,7 @@ #define MAP_H #include "core/error/error_macros.h" -#include "core/templates/set.h" +#include "core/os/memory.h" // based on the very nice implementation of rb-trees by: // https://web.archive.org/web/20120507164830/http://web.mit.edu/~emin/www/source_code/red_black_tree/index.html |