Inicio Explorar Axuda
Iniciar sesión
Godot
/
godot
réplica de https://github.com/godotengine/godot.git
2
0
Fork 0
Ficheiros Incidencias 0 Wiki
Explorar o código

Merge pull request #47886 from Pineapple/separate-set

Separate set.h from map.h
Rémi Verschelde %!s(int64=4) %!d(string=hai) anos
pai
8fc4a732de 1eaaf2f9a2
achega
8ce0fb0a94
Modificáronse 2 ficheiros con 2 adicións e 1 borrados
Unificar vista Mostrar estatísticas de Diff
  1. 1 0
      core/io/file_access_pack.h
  2. 1 1
      core/templates/map.h

+ 1 - 0
core/io/file_access_pack.h
Ver ficheiro 

@@ -36,6 +36,7 @@
 
 #include "core/string/print_string.h"
 
 #include "core/string/print_string.h"
 
 #include "core/templates/list.h"
 
 #include "core/templates/list.h"
 
 #include "core/templates/map.h"
 
 #include "core/templates/map.h"
 
+#include "core/templates/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

+ 1 - 1
core/templates/map.h
Ver ficheiro 

@@ -32,7 +32,7 @@
 
 #define MAP_H
 
 #define MAP_H
 
 
 
 #include "core/error/error_macros.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:
 
 // 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