diff --git a/Minecraft.World/Blocks/PistonBaseTile.h b/Minecraft.World/Blocks/PistonBaseTile.h index 48c420010..9dd9e0e15 100644 --- a/Minecraft.World/Blocks/PistonBaseTile.h +++ b/Minecraft.World/Blocks/PistonBaseTile.h @@ -4,12 +4,6 @@ class PistonBaseTile : public Tile { public: -#if defined(_WIN32) - using TlsKey = std::uint32_t; -#else - using TlsKey = pthread_key_t; -#endif - static const int EXTENDED_BIT = 8; static const int UNDEFINED_FACING = 7; diff --git a/Minecraft.World/Blocks/Tile.h b/Minecraft.World/Blocks/Tile.h index 925fd477c..b46748ff5 100644 --- a/Minecraft.World/Blocks/Tile.h +++ b/Minecraft.World/Blocks/Tile.h @@ -50,12 +50,6 @@ class Tile { friend class WallTile; protected: -#if defined(_WIN32) - using TlsKey = std::uint32_t; -#else - using TlsKey = pthread_key_t; -#endif - // 4J added so we can have separate shapes for different threads class ThreadStorage { public: diff --git a/Minecraft.World/Entities/Entity.h b/Minecraft.World/Entities/Entity.h index 0a877b2f6..e7aede835 100644 --- a/Minecraft.World/Entities/Entity.h +++ b/Minecraft.World/Entities/Entity.h @@ -36,12 +36,6 @@ class Entity : public std::enable_shared_from_this { friend class Gui; // 4J Stu - Added to be able to access the shared flag // functions and constants, without making them publicly // available to everything -public: -#if defined(_WIN32) - using TlsKey = std::uint32_t; -#else - using TlsKey = pthread_key_t; -#endif // 4J-PB - added to replace (e instanceof Type), avoiding dynamic casts virtual eINSTANCEOF GetType() = 0; diff --git a/Minecraft.World/Level/Storage/OldChunkStorage.h b/Minecraft.World/Level/Storage/OldChunkStorage.h index 0b40872bd..c451d6ffd 100644 --- a/Minecraft.World/Level/Storage/OldChunkStorage.h +++ b/Minecraft.World/Level/Storage/OldChunkStorage.h @@ -9,13 +9,6 @@ class Level; class OldChunkStorage : public ChunkStorage { -public: -#if defined(_WIN32) - using TlsKey = std::uint32_t; -#else - using TlsKey = pthread_key_t; -#endif - private: // 4J added so we can have separate storage arrays for different threads class ThreadStorage {