godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #47887 from Pineapple/separate-set-3x

Browse Source 
[3.x] Separate set.h from map.h
This commit is contained in:
Rémi Verschelde 2021-04-28 16:58:09 +02:00 committed by GitHub
commit 3ded745305
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/io/file_access_pack.h
View File

@ -36,6 +36,7 @@
#include "core/os/dir_access.h" #include "core/os/dir_access.h"
#include "core/os/file_access.h" #include "core/os/file_access.h"
#include "core/print_string.h" #include "core/print_string.h"
#include "core/set.h"
// Godot's packed file magic header ("GDPC" in ASCII). // Godot's packed file magic header ("GDPC" in ASCII).
#define PACK_HEADER_MAGIC 0x43504447 #define PACK_HEADER_MAGIC 0x43504447

2
core/map.h
View File

@ -32,7 +32,7 @@
#define MAP_H #define MAP_H
#include "core/error_macros.h" #include "core/error_macros.h"
#include "core/set.h" #include "core/os/memory.h"
// based on the very nice implementation of rb-trees by: // 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 // https://web.archive.org/web/20120507164830/http://web.mit.edu/~emin/www/source_code/red_black_tree/index.html