diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/BlockEntities/BlockEntity.h | 1 | ||||
| -rw-r--r-- | src/BlockTypePalette.h | 1 | ||||
| -rw-r--r-- | src/Blocks/BlockPiston.h | 1 | ||||
| -rw-r--r-- | src/ChunkSender.h | 3 | ||||
| -rw-r--r-- | src/Entities/Player.cpp | 2 | ||||
| -rw-r--r-- | src/Generating/PrefabPiecePool.h | 1 | ||||
| -rw-r--r-- | src/Globals.h | 23 | ||||
| -rw-r--r-- | src/MemorySettingsRepository.h | 2 | ||||
| -rw-r--r-- | src/Mobs/Path.h | 1 | ||||
| -rw-r--r-- | src/OSSupport/File.cpp | 1 | ||||
| -rw-r--r-- | src/OverridesSettingsRepository.h | 2 | ||||
| -rw-r--r-- | src/Simulator/IncrementalRedstoneSimulator/RedstoneSimulatorChunkData.h | 1 |
12 files changed, 13 insertions, 26 deletions
diff --git a/src/BlockEntities/BlockEntity.h b/src/BlockEntities/BlockEntity.h index 3cbceedb7..474192107 100644 --- a/src/BlockEntities/BlockEntity.h +++ b/src/BlockEntities/BlockEntity.h @@ -1,7 +1,6 @@ #pragma once -#include <unordered_map> diff --git a/src/BlockTypePalette.h b/src/BlockTypePalette.h index 3b6cb9ec0..2aade422b 100644 --- a/src/BlockTypePalette.h +++ b/src/BlockTypePalette.h @@ -1,6 +1,5 @@ #pragma once -#include <unordered_map> #include <utility> #include "BlockState.h" diff --git a/src/Blocks/BlockPiston.h b/src/Blocks/BlockPiston.h index 2cc872097..7ff478a68 100644 --- a/src/Blocks/BlockPiston.h +++ b/src/Blocks/BlockPiston.h @@ -2,7 +2,6 @@ #pragma once #include "BlockHandler.h" -#include <unordered_set> #include "Mixins.h" #include "../Item.h" diff --git a/src/ChunkSender.h b/src/ChunkSender.h index baee32ec9..7caf9424e 100644 --- a/src/ChunkSender.h +++ b/src/ChunkSender.h @@ -28,9 +28,6 @@ Note that it may be called by world's BroadcastToChunk() if the client is still #include "OSSupport/IsThread.h" #include "ChunkDataCallback.h" -#include <unordered_set> -#include <unordered_map> - diff --git a/src/Entities/Player.cpp b/src/Entities/Player.cpp index df410575e..9ceded8b2 100644 --- a/src/Entities/Player.cpp +++ b/src/Entities/Player.cpp @@ -1,8 +1,6 @@ #include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules -#include <unordered_map> - #include "Player.h" #include "../Mobs/Wolf.h" #include "../Mobs/Horse.h" diff --git a/src/Generating/PrefabPiecePool.h b/src/Generating/PrefabPiecePool.h index 425b64607..84aba92d1 100644 --- a/src/Generating/PrefabPiecePool.h +++ b/src/Generating/PrefabPiecePool.h @@ -9,7 +9,6 @@ #pragma once -#include <unordered_set> #include "PiecePool.h" #include "Prefab.h" diff --git a/src/Globals.h b/src/Globals.h index 7af475816..114991129 100644 --- a/src/Globals.h +++ b/src/Globals.h @@ -157,7 +157,6 @@ template class SizeChecker<UInt8, 1>; // CRT stuff: -#include <sys/stat.h> #include <cassert> #include <cstdio> #include <cmath> @@ -168,24 +167,26 @@ template class SizeChecker<UInt8, 1>; // STL stuff: +#include <algorithm> #include <array> +#include <atomic> #include <chrono> -#include <vector> -#include <list> +#include <condition_variable> #include <deque> -#include <string> +#include <limits> +#include <list> #include <map> -#include <algorithm> #include <memory> -#include <set> +#include <mutex> #include <queue> -#include <limits> #include <random> -#include <type_traits> -#include <atomic> -#include <mutex> +#include <set> +#include <string> #include <thread> -#include <condition_variable> +#include <type_traits> +#include <unordered_map> +#include <unordered_set> +#include <vector> diff --git a/src/MemorySettingsRepository.h b/src/MemorySettingsRepository.h index 77e91a27d..486f6706a 100644 --- a/src/MemorySettingsRepository.h +++ b/src/MemorySettingsRepository.h @@ -3,8 +3,6 @@ #include "SettingsRepositoryInterface.h" -#include <unordered_map> - class cMemorySettingsRepository : public cSettingsRepositoryInterface { public: diff --git a/src/Mobs/Path.h b/src/Mobs/Path.h index 977c5be1c..20834535b 100644 --- a/src/Mobs/Path.h +++ b/src/Mobs/Path.h @@ -15,7 +15,6 @@ class cPath; #include "PathFinderIrrlicht_Head.h" #endif -#include <unordered_map> //fwd: ../Chunk.h class cChunk; diff --git a/src/OSSupport/File.cpp b/src/OSSupport/File.cpp index 03d621a38..2d26c3cd6 100644 --- a/src/OSSupport/File.cpp +++ b/src/OSSupport/File.cpp @@ -7,6 +7,7 @@ #include "File.h" #include <fstream> +#include <sys/stat.h> #ifdef _WIN32 #include <share.h> // for _SH_DENYWRITE #else diff --git a/src/OverridesSettingsRepository.h b/src/OverridesSettingsRepository.h index d168b7b72..05260f711 100644 --- a/src/OverridesSettingsRepository.h +++ b/src/OverridesSettingsRepository.h @@ -3,8 +3,6 @@ #include "SettingsRepositoryInterface.h" -#include <unordered_map> - class cOverridesSettingsRepository : public cSettingsRepositoryInterface { diff --git a/src/Simulator/IncrementalRedstoneSimulator/RedstoneSimulatorChunkData.h b/src/Simulator/IncrementalRedstoneSimulator/RedstoneSimulatorChunkData.h index 7bf4ccaad..a842770a5 100644 --- a/src/Simulator/IncrementalRedstoneSimulator/RedstoneSimulatorChunkData.h +++ b/src/Simulator/IncrementalRedstoneSimulator/RedstoneSimulatorChunkData.h @@ -3,7 +3,6 @@ #include "RedstoneHandler.h" #include "../RedstoneSimulator.h" -#include <unordered_map> |