refactor: unglob std::enable_shared_from_this

Minecraft.World/Blocks/TileEntities/TileEntity.h

@@ -10,7 +10,7 @@ class CompoundTag;
 
 typedef TileEntity *(*tileEntityCreateFn)();
 
-class TileEntity : public enable_shared_from_this<TileEntity>
+class TileEntity : public std::enable_shared_from_this<TileEntity>
 {
 public:
 	static void staticCtor();

Minecraft.World/Containers/ClientSideMerchant.h

@@ -6,7 +6,7 @@ class MerchantContainer;
 class MerchantRecipeList;
 class MerchantRecipe;
 
-class ClientSideMerchant : public Merchant, public enable_shared_from_this<ClientSideMerchant>
+class ClientSideMerchant : public Merchant, public std::enable_shared_from_this<ClientSideMerchant>
 {
 private:
 	MerchantContainer *container;

Minecraft.World/Containers/RepairContainer.h

@@ -4,7 +4,7 @@
 
 class RepairMenu;
 
-class RepairContainer : public SimpleContainer, public enable_shared_from_this<RepairContainer>
+class RepairContainer : public SimpleContainer, public std::enable_shared_from_this<RepairContainer>
 {
 private:
 	RepairMenu *m_menu;

Minecraft.World/Entities/Entity.h

@@ -32,7 +32,7 @@ enum EEntityDamageType
 	eEntityDamageType_Cactus,
 };
 
-class Entity : public enable_shared_from_this<Entity>
+class Entity : public std::enable_shared_from_this<Entity>
 {
 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:

Minecraft.World/Items/Item.h

@@ -24,7 +24,7 @@ class EnchantedBookItem;
 #define ITEM_ICON_COLUMNS 16
 
 
-class Item : public enable_shared_from_this<Item>
+class Item : public std::enable_shared_from_this<Item>
 {
 public:
 	static const int ITEM_NUM_COUNT = 32000;

Minecraft.World/Items/ItemInstance.h

@@ -18,7 +18,7 @@ class Icon;
 
 // 4J Stu - While this is not really an abstract class, we don't want to make new instances of it,
 // mainly because there are too many ctors and that doesn't fit well into out macroisation setup
-class ItemInstance: public enable_shared_from_this<ItemInstance>
+class ItemInstance: public std::enable_shared_from_this<ItemInstance>
 {
 public:
 	static const wchar_t *TAG_ENCH_ID;

Minecraft.World/Level/Storage/SavedData.h

@@ -5,7 +5,7 @@ using namespace std;
 
 class CompoundTag;
 
-class SavedData :  public enable_shared_from_this<SavedData>
+class SavedData :  public std::enable_shared_from_this<SavedData>
 {
 public:
 	const std::wstring id;

Minecraft.World/Network/Packets/AddEntityPacket.h

@@ -3,7 +3,7 @@ using namespace std;
 
 #include "Packet.h"
 
-class AddEntityPacket : public Packet, public enable_shared_from_this<AddEntityPacket>
+class AddEntityPacket : public Packet, public std::enable_shared_from_this<AddEntityPacket>
 {
 public:
 	static const int BOAT = 1;

Minecraft.World/Network/Packets/AddExperienceOrbPacket.h

@@ -4,7 +4,7 @@
 
 class ExperienceOrb;
 
-class AddExperienceOrbPacket : public Packet, public enable_shared_from_this<AddExperienceOrbPacket>
+class AddExperienceOrbPacket : public Packet, public std::enable_shared_from_this<AddExperienceOrbPacket>
 {
 public:
 	int id;

Minecraft.World/Network/Packets/AddGlobalEntityPacket.h

@@ -2,7 +2,7 @@
 
 #include "Packet.h"
 
-class AddGlobalEntityPacket : public Packet, public enable_shared_from_this<AddGlobalEntityPacket>
+class AddGlobalEntityPacket : public Packet, public std::enable_shared_from_this<AddGlobalEntityPacket>
 {
 public:
 	static const int LIGHTNING;

Minecraft.World/Network/Packets/AddMobPacket.h

@@ -6,7 +6,7 @@ using namespace std;
 
 class Mob;
 
-class AddMobPacket : public Packet, public enable_shared_from_this<AddMobPacket>
+class AddMobPacket : public Packet, public std::enable_shared_from_this<AddMobPacket>
 {
 public:
 	int id;

Minecraft.World/Network/Packets/AddPaintingPacket.h

@@ -5,7 +5,7 @@ using namespace std;
 
 class Painting;
 
-class AddPaintingPacket : public Packet, public enable_shared_from_this<AddPaintingPacket>
+class AddPaintingPacket : public Packet, public std::enable_shared_from_this<AddPaintingPacket>
 {
 public:
 	int id;

Minecraft.World/Network/Packets/AddPlayerPacket.h

@@ -6,7 +6,7 @@ using namespace std;
 
 class Player;
 
-class AddPlayerPacket : public Packet, public enable_shared_from_this<AddPlayerPacket>
+class AddPlayerPacket : public Packet, public std::enable_shared_from_this<AddPlayerPacket>
 {
 
 private:

Minecraft.World/Network/Packets/AnimatePacket.h

@@ -3,7 +3,7 @@ using namespace std;
 
 #include "Packet.h"
 
-class AnimatePacket : public Packet, public enable_shared_from_this<AnimatePacket>
+class AnimatePacket : public Packet, public std::enable_shared_from_this<AnimatePacket>
 {
 public:
 	static const int SWING = 1;

Minecraft.World/Network/Packets/AwardStatPacket.h

@@ -3,7 +3,7 @@ using namespace std;
 
 #include "Packet.h"
 
-class AwardStatPacket : public Packet, public enable_shared_from_this<AwardStatPacket>
+class AwardStatPacket : public Packet, public std::enable_shared_from_this<AwardStatPacket>
 {
 public:
 	int statId;

Minecraft.World/Network/Packets/BlockRegionUpdatePacket.h

@@ -5,7 +5,7 @@ using namespace std;
 
 class Level;
 
-class BlockRegionUpdatePacket : public Packet, public enable_shared_from_this<BlockRegionUpdatePacket>
+class BlockRegionUpdatePacket : public Packet, public std::enable_shared_from_this<BlockRegionUpdatePacket>
 {
 public:
     int x, y, z;

Minecraft.World/Network/Packets/ChatPacket.h

@@ -3,7 +3,7 @@ using namespace std;
 
 #include "Packet.h"
 
-class ChatPacket : public Packet, public enable_shared_from_this<ChatPacket>
+class ChatPacket : public Packet, public std::enable_shared_from_this<ChatPacket>
 {
     // longest allowed string is "<" + name + "> " + message
 private:

Minecraft.World/Network/Packets/ChunkTilesUpdatePacket.h

@@ -5,7 +5,7 @@ using namespace std;
 
 class Level;
 
-class ChunkTilesUpdatePacket : public Packet, public enable_shared_from_this<ChunkTilesUpdatePacket>
+class ChunkTilesUpdatePacket : public Packet, public std::enable_shared_from_this<ChunkTilesUpdatePacket>
 {
 public:
 	int xc, zc;

Minecraft.World/Network/Packets/ChunkVisibilityAreaPacket.h

@@ -7,7 +7,7 @@ class Level;
 
 // 4J Added this packet so that when a player initially joins the game we just need to send them the area of chunks
 // around them rather than one packet for each chunk
-class ChunkVisibilityAreaPacket : public Packet, public enable_shared_from_this<ChunkVisibilityAreaPacket>
+class ChunkVisibilityAreaPacket : public Packet, public std::enable_shared_from_this<ChunkVisibilityAreaPacket>
 {
 public:
     int m_minX, m_maxX, m_minZ, m_maxZ;

Minecraft.World/Network/Packets/ChunkVisibilityPacket.h

@@ -7,7 +7,7 @@ using namespace std;
 #include <iostream>
 #include "PacketListener.h"
 
-class ChunkVisibilityPacket : public Packet, public enable_shared_from_this<ChunkVisibilityPacket>
+class ChunkVisibilityPacket : public Packet, public std::enable_shared_from_this<ChunkVisibilityPacket>
 {
 public:
 	int x, z;

Minecraft.World/Network/Packets/ClientCommandPacket.h

@@ -2,7 +2,7 @@
 
 #include "Packet.h"
 
-class ClientCommandPacket : public Packet, public enable_shared_from_this<ClientCommandPacket>
+class ClientCommandPacket : public Packet, public std::enable_shared_from_this<ClientCommandPacket>
 {
 public:
 	static const int LOGIN_COMPLETE = 0;

Minecraft.World/Network/Packets/ComplexItemDataPacket.h

@@ -3,7 +3,7 @@ using namespace std;
 
 #include "Packet.h"
 
-class ComplexItemDataPacket : public Packet, public enable_shared_from_this<ComplexItemDataPacket>
+class ComplexItemDataPacket : public Packet, public std::enable_shared_from_this<ComplexItemDataPacket>
 {
 public:
 	short itemType;

Minecraft.World/Network/Packets/ContainerAckPacket.h

@@ -7,7 +7,7 @@ using namespace std;
 #include <iostream>
 #include "PacketListener.h"
 
-class ContainerAckPacket : public Packet, public enable_shared_from_this<ContainerAckPacket>
+class ContainerAckPacket : public Packet, public std::enable_shared_from_this<ContainerAckPacket>
 {
 public:
 	int containerId;

Minecraft.World/Network/Packets/ContainerButtonClickPacket.h

@@ -2,7 +2,7 @@
 
 #include "Packet.h"
 
-class ContainerButtonClickPacket : public Packet, public enable_shared_from_this<ContainerButtonClickPacket>
+class ContainerButtonClickPacket : public Packet, public std::enable_shared_from_this<ContainerButtonClickPacket>
 {
 public:
 	int containerId;

Minecraft.World/Network/Packets/ContainerClickPacket.h

@@ -3,7 +3,7 @@ using namespace std;
 
 #include "Packet.h"
 
-class ContainerClickPacket : public Packet, public enable_shared_from_this<ContainerClickPacket>
+class ContainerClickPacket : public Packet, public std::enable_shared_from_this<ContainerClickPacket>
 {
 public:
 	int containerId;

Minecraft.World/Network/Packets/ContainerClosePacket.h

@@ -3,7 +3,7 @@ using namespace std;
 
 #include "Packet.h"
 
-class ContainerClosePacket : public Packet, public enable_shared_from_this<ContainerClosePacket>
+class ContainerClosePacket : public Packet, public std::enable_shared_from_this<ContainerClosePacket>
 {
 public:
 	int containerId;

Minecraft.World/Network/Packets/ContainerOpenPacket.h

@@ -3,7 +3,7 @@ using namespace std;
 
 #include "Packet.h"
 
-class ContainerOpenPacket : public Packet, public enable_shared_from_this<ContainerOpenPacket>
+class ContainerOpenPacket : public Packet, public std::enable_shared_from_this<ContainerOpenPacket>
 {
 public:
 	static const int CONTAINER = 0;

Minecraft.World/Network/Packets/ContainerSetContentPacket.h

@@ -3,7 +3,7 @@ using namespace std;
 
 #include "Packet.h"
 
-class ContainerSetContentPacket : public Packet, public enable_shared_from_this<ContainerSetContentPacket>
+class ContainerSetContentPacket : public Packet, public std::enable_shared_from_this<ContainerSetContentPacket>
 {
 public:
 	int containerId;

Minecraft.World/Network/Packets/ContainerSetDataPacket.h

@@ -3,7 +3,7 @@ using namespace std;
 
 #include "Packet.h"
 
-class ContainerSetDataPacket : public Packet, public enable_shared_from_this<ContainerSetDataPacket>
+class ContainerSetDataPacket : public Packet, public std::enable_shared_from_this<ContainerSetDataPacket>
 {
 public:
 	int containerId;

Minecraft.World/Network/Packets/ContainerSetSlotPacket.h

@@ -3,7 +3,7 @@ using namespace std;
 
 #include "Packet.h"
 
-class ContainerSetSlotPacket : public Packet, public enable_shared_from_this<ContainerSetSlotPacket>
+class ContainerSetSlotPacket : public Packet, public std::enable_shared_from_this<ContainerSetSlotPacket>
 {
 public:
 	static const int CONTAINER;

Minecraft.World/Network/Packets/CraftItemPacket.h

@@ -6,7 +6,7 @@ using namespace std;
 
 #include "Packet.h"
 
-class CraftItemPacket : public Packet, public enable_shared_from_this<CraftItemPacket>
+class CraftItemPacket : public Packet, public std::enable_shared_from_this<CraftItemPacket>
 {
 public:
 	int recipe;

Minecraft.World/Network/Packets/CustomPayloadPacket.h

@@ -3,7 +3,7 @@ using namespace std;
 
 #include "Packet.h"
 
-class CustomPayloadPacket : public Packet, public enable_shared_from_this<CustomPayloadPacket>
+class CustomPayloadPacket : public Packet, public std::enable_shared_from_this<CustomPayloadPacket>
 {
 public:
 

Minecraft.World/Network/Packets/DebugOptionsPacket.h

@@ -6,7 +6,7 @@ using namespace std;
 
 #include "Packet.h"
 
-class DebugOptionsPacket : public Packet, public enable_shared_from_this<DebugOptionsPacket>
+class DebugOptionsPacket : public Packet, public std::enable_shared_from_this<DebugOptionsPacket>
 {
 public:
 	unsigned int m_uiVal;

Minecraft.World/Network/Packets/DisconnectPacket.h

@@ -3,7 +3,7 @@ using namespace std;
 
 #include "Packet.h"
 
-class DisconnectPacket : public Packet, public enable_shared_from_this<DisconnectPacket>
+class DisconnectPacket : public Packet, public std::enable_shared_from_this<DisconnectPacket>
 {
 public:
 

Minecraft.World/Network/Packets/EntityActionAtPositionPacket.h

@@ -3,7 +3,7 @@ using namespace std;
 
 #include "Packet.h"
 
-class EntityActionAtPositionPacket : public Packet, public enable_shared_from_this<EntityActionAtPositionPacket>
+class EntityActionAtPositionPacket : public Packet, public std::enable_shared_from_this<EntityActionAtPositionPacket>
 {
 public:
 	static const int START_SLEEP;

Minecraft.World/Network/Packets/EntityEventPacket.h

@@ -3,7 +3,7 @@ using namespace std;
 
 #include "Packet.h"
 
-class EntityEventPacket : public Packet, public enable_shared_from_this<EntityEventPacket>
+class EntityEventPacket : public Packet, public std::enable_shared_from_this<EntityEventPacket>
 {
 public:
 	int entityId;

Minecraft.World/Network/Packets/ExplodePacket.h

@@ -4,7 +4,7 @@ using namespace std;
 #include "../../Level/TilePos.h"
 #include "Packet.h"
 
-class ExplodePacket : public Packet, public enable_shared_from_this<ExplodePacket>
+class ExplodePacket : public Packet, public std::enable_shared_from_this<ExplodePacket>
 {
 public:
 	double x, y, z;

Minecraft.World/Network/Packets/GameCommandPacket.h

@@ -4,7 +4,7 @@ using namespace std;
 #include "../../Commands/CommandsEnum.h"
 #include "Packet.h"
 
-class GameCommandPacket : public Packet, public enable_shared_from_this<GameCommandPacket>
+class GameCommandPacket : public Packet, public std::enable_shared_from_this<GameCommandPacket>
 {
 public:
 	EGameCommand command;

Minecraft.World/Network/Packets/GameEventPacket.h

@@ -3,7 +3,7 @@ using namespace std;
 
 #include "Packet.h"
 
-class GameEventPacket : public Packet, public enable_shared_from_this<GameEventPacket>
+class GameEventPacket : public Packet, public std::enable_shared_from_this<GameEventPacket>
 {
 
 public:

Minecraft.World/Network/Packets/GetInfoPacket.h

@@ -2,7 +2,7 @@
 
 #include "Packet.h"
 
-class GetInfoPacket : public Packet, public enable_shared_from_this<GetInfoPacket>
+class GetInfoPacket : public Packet, public std::enable_shared_from_this<GetInfoPacket>
 {
 public:
 	virtual void read(DataInputStream *dis);

Minecraft.World/Network/Packets/InteractPacket.h

@@ -3,7 +3,7 @@ using namespace std;
 
 #include "Packet.h"
 
-class InteractPacket : public Packet, public enable_shared_from_this<InteractPacket>
+class InteractPacket : public Packet, public std::enable_shared_from_this<InteractPacket>
 {
 public:
 	static const int INTERACT;

Minecraft.World/Network/Packets/KeepAlivePacket.h

@@ -3,7 +3,7 @@ using namespace std;
 
 #include "Packet.h"
 
-class KeepAlivePacket : public Packet, public enable_shared_from_this<KeepAlivePacket>
+class KeepAlivePacket : public Packet, public std::enable_shared_from_this<KeepAlivePacket>
 {
 public:
 	int id;

Minecraft.World/Network/Packets/KickPlayerPacket.h

@@ -3,7 +3,7 @@ using namespace std;
 
 #include "Packet.h"
 
-class KickPlayerPacket : public Packet, public enable_shared_from_this<KickPlayerPacket>
+class KickPlayerPacket : public Packet, public std::enable_shared_from_this<KickPlayerPacket>
 {
 public:
 	BYTE m_networkSmallId;

Minecraft.World/Network/Packets/LevelEventPacket.h

@@ -3,7 +3,7 @@ using namespace std;
 
 #include "Packet.h"
 
-class LevelEventPacket : public Packet, public enable_shared_from_this<LevelEventPacket>
+class LevelEventPacket : public Packet, public std::enable_shared_from_this<LevelEventPacket>
 {
 public:
 	int type;

Minecraft.World/Network/Packets/LevelSoundPacket.h

@@ -2,7 +2,7 @@
 
 #include "Packet.h"
 
-class LevelSoundPacket : public Packet, public enable_shared_from_this<LevelSoundPacket>
+class LevelSoundPacket : public Packet, public std::enable_shared_from_this<LevelSoundPacket>
 {
 public:
 	static const float PITCH_ACCURACY;

Minecraft.World/Network/Packets/LoginPacket.h

@@ -4,7 +4,7 @@ using namespace std;
 #include "Packet.h"
 class LevelType;
 
-class LoginPacket : public Packet, public enable_shared_from_this<LoginPacket>
+class LoginPacket : public Packet, public std::enable_shared_from_this<LoginPacket>
 {
 public:
 	int clientVersion;

Minecraft.World/Network/Packets/MoveEntityPacket.h

@@ -3,7 +3,7 @@ using namespace std;
 
 #include "Packet.h"
 
-class MoveEntityPacket : public Packet, public enable_shared_from_this<MoveEntityPacket>
+class MoveEntityPacket : public Packet, public std::enable_shared_from_this<MoveEntityPacket>
 {
 
 	// 4J JEV, static inner/sub classes

Minecraft.World/Network/Packets/MoveEntityPacketSmall.h

@@ -3,7 +3,7 @@ using namespace std;
 
 #include "Packet.h"
 
-class MoveEntityPacketSmall : public Packet, public enable_shared_from_this<MoveEntityPacketSmall>
+class MoveEntityPacketSmall : public Packet, public std::enable_shared_from_this<MoveEntityPacketSmall>
 {
 
 	// 4J JEV, static inner/sub classes

Minecraft.World/Network/Packets/MovePlayerPacket.h

@@ -3,7 +3,7 @@ using namespace std;
 
 #include "Packet.h"
 
-class MovePlayerPacket : public Packet, public enable_shared_from_this<MovePlayerPacket>
+class MovePlayerPacket : public Packet, public std::enable_shared_from_this<MovePlayerPacket>
 {
 public:
 	class PosRot;

Minecraft.World/Network/Packets/PlayerAbilitiesPacket.h

@@ -4,7 +4,7 @@
 
 class Abilities;
 
-class PlayerAbilitiesPacket : public Packet, public enable_shared_from_this<PlayerAbilitiesPacket>
+class PlayerAbilitiesPacket : public Packet, public std::enable_shared_from_this<PlayerAbilitiesPacket>
 {
 private:
 	static const int FLAG_INVULNERABLE = 1 << 0;

Minecraft.World/Network/Packets/PlayerActionPacket.h

@@ -3,7 +3,7 @@ using namespace std;
 
 #include "Packet.h"
 
-class PlayerActionPacket : public Packet, public enable_shared_from_this<PlayerActionPacket>
+class PlayerActionPacket : public Packet, public std::enable_shared_from_this<PlayerActionPacket>
 {
 public:
 	static const int START_DESTROY_BLOCK;

Minecraft.World/Network/Packets/PlayerCommandPacket.h

@@ -3,7 +3,7 @@ using namespace std;
 
 #include "Packet.h"
 
-class PlayerCommandPacket : public Packet, public enable_shared_from_this<PlayerCommandPacket>
+class PlayerCommandPacket : public Packet, public std::enable_shared_from_this<PlayerCommandPacket>
 {
 public:
 	static const int START_SNEAKING;

Minecraft.World/Network/Packets/PlayerInfoPacket.h

@@ -4,7 +4,7 @@ using namespace std;
 
 class ServerPlayer;
 
-class PlayerInfoPacket : public Packet, public enable_shared_from_this<PlayerInfoPacket>
+class PlayerInfoPacket : public Packet, public std::enable_shared_from_this<PlayerInfoPacket>
 {
 	public:
 		// 4J Stu - I have re-purposed this packet for our uses

Minecraft.World/Network/Packets/PlayerInputPacket.h

@@ -3,7 +3,7 @@ using namespace std;
 
 #include "Packet.h"
 
-class PlayerInputPacket : public Packet, public enable_shared_from_this<PlayerInputPacket>
+class PlayerInputPacket : public Packet, public std::enable_shared_from_this<PlayerInputPacket>
 {
 
 private:

Minecraft.World/Network/Packets/PreLoginPacket.h

@@ -3,7 +3,7 @@ using namespace std;
 
 #include "Packet.h"
 
-class PreLoginPacket : public Packet, public enable_shared_from_this<PreLoginPacket>
+class PreLoginPacket : public Packet, public std::enable_shared_from_this<PreLoginPacket>
 {
     // the login key is username client->server and sessionid server->client
 public:

Minecraft.World/Network/Packets/RemoveEntitiesPacket.h

@@ -4,7 +4,7 @@ using namespace std;
 #include "../../Util/BasicTypeContainers.h"
 #include "Packet.h"
 
-class RemoveEntitiesPacket : public Packet, public enable_shared_from_this<RemoveEntitiesPacket>
+class RemoveEntitiesPacket : public Packet, public std::enable_shared_from_this<RemoveEntitiesPacket>
 {
 public:
 	static const int MAX_PER_PACKET = Byte::MAX_VALUE;

Minecraft.World/Network/Packets/RemoveMobEffectPacket.h

@@ -4,7 +4,7 @@ class MobEffectInstance;
 
 #include "Packet.h"
 
-class RemoveMobEffectPacket : public Packet, public enable_shared_from_this<RemoveMobEffectPacket>
+class RemoveMobEffectPacket : public Packet, public std::enable_shared_from_this<RemoveMobEffectPacket>
 {
 	public:
 		int entityId;

Minecraft.World/Network/Packets/RespawnPacket.h

@@ -6,7 +6,7 @@ using namespace std;
 class LevelType;
 class GameType;
 
-class RespawnPacket : public Packet, public enable_shared_from_this<RespawnPacket>
+class RespawnPacket : public Packet, public std::enable_shared_from_this<RespawnPacket>
 {
 public:
 	char dimension;

Minecraft.World/Network/Packets/RotateHeadPacket.h

@@ -4,7 +4,7 @@
 #include "PacketListener.h"
 #include "Packet.h"
 
-class RotateHeadPacket : public Packet, public enable_shared_from_this<RotateHeadPacket>
+class RotateHeadPacket : public Packet, public std::enable_shared_from_this<RotateHeadPacket>
 {
 public:
 	int id;

Minecraft.World/Network/Packets/ServerSettingsChangedPacket.h

@@ -6,7 +6,7 @@ using namespace std;
 
 #include "Packet.h"
 
-class ServerSettingsChangedPacket : public Packet, public enable_shared_from_this<ServerSettingsChangedPacket>
+class ServerSettingsChangedPacket : public Packet, public std::enable_shared_from_this<ServerSettingsChangedPacket>
 {
 public:
 	static const int HOST_DIFFICULTY;

Minecraft.World/Network/Packets/SetCarriedItemPacket.h

@@ -3,7 +3,7 @@ using namespace std;
 
 #include "Packet.h"
 
-class SetCarriedItemPacket : public Packet, public enable_shared_from_this<SetCarriedItemPacket>
+class SetCarriedItemPacket : public Packet, public std::enable_shared_from_this<SetCarriedItemPacket>
 {
 public:
 	int slot;

Minecraft.World/Network/Packets/SetCreativeModeSlotPacket.h

@@ -2,7 +2,7 @@
 
 #include "Packet.h"
 
-class SetCreativeModeSlotPacket : public Packet, public enable_shared_from_this<SetCreativeModeSlotPacket>
+class SetCreativeModeSlotPacket : public Packet, public std::enable_shared_from_this<SetCreativeModeSlotPacket>
 {
 	public:
 		int slotNum;

Minecraft.World/Network/Packets/SetEntityDataPacket.h

@@ -4,7 +4,7 @@ using namespace std;
 #include "Packet.h"
 #include "../../Entities/SyncedEntityData.h"
 
-class SetEntityDataPacket : public Packet, public enable_shared_from_this<SetEntityDataPacket>
+class SetEntityDataPacket : public Packet, public std::enable_shared_from_this<SetEntityDataPacket>
 {
 public:
 	int id;

Minecraft.World/Network/Packets/SetEntityMotionPacket.h

@@ -3,7 +3,7 @@ using namespace std;
 
 #include "Packet.h"
 
-class SetEntityMotionPacket : public Packet, public enable_shared_from_this<SetEntityMotionPacket>
+class SetEntityMotionPacket : public Packet, public std::enable_shared_from_this<SetEntityMotionPacket>
 {
 public:
 	int id;

Minecraft.World/Network/Packets/SetEquippedItemPacket.h

@@ -3,7 +3,7 @@ using namespace std;
 
 #include "Packet.h"
 
-class SetEquippedItemPacket : public Packet, public enable_shared_from_this<SetEquippedItemPacket>
+class SetEquippedItemPacket : public Packet, public std::enable_shared_from_this<SetEquippedItemPacket>
 {
 public:
 	int entity;

Minecraft.World/Network/Packets/SetExperiencePacket.h

@@ -2,7 +2,7 @@
 
 #include "Packet.h"
 
-class SetExperiencePacket : public Packet, public enable_shared_from_this<SetExperiencePacket>
+class SetExperiencePacket : public Packet, public std::enable_shared_from_this<SetExperiencePacket>
 {
 public:
 	float experienceProgress;

Minecraft.World/Network/Packets/SetHealthPacket.h

@@ -3,7 +3,7 @@ using namespace std;
 
 #include "Packet.h"
 
-class SetHealthPacket : public Packet, public enable_shared_from_this<SetHealthPacket>
+class SetHealthPacket : public Packet, public std::enable_shared_from_this<SetHealthPacket>
 {
 public:
 	int health;

Minecraft.World/Network/Packets/SetRidingPacket.h

@@ -3,7 +3,7 @@ using namespace std;
 
 #include "Packet.h"
 
-class SetRidingPacket : public Packet, public enable_shared_from_this<SetRidingPacket>
+class SetRidingPacket : public Packet, public std::enable_shared_from_this<SetRidingPacket>
 {
 public:
 	int riderId, riddenId;

Minecraft.World/Network/Packets/SetSpawnPositionPacket.h

@@ -3,7 +3,7 @@ using namespace std;
 
 #include "Packet.h"
 
-class SetSpawnPositionPacket : public Packet, public enable_shared_from_this<SetSpawnPositionPacket>
+class SetSpawnPositionPacket : public Packet, public std::enable_shared_from_this<SetSpawnPositionPacket>
 {
 public:
 	int x, y, z;

Minecraft.World/Network/Packets/SetTimePacket.h

@@ -3,7 +3,7 @@ using namespace std;
 
 #include "Packet.h"
 
-class SetTimePacket : public Packet, public enable_shared_from_this<SetTimePacket>
+class SetTimePacket : public Packet, public std::enable_shared_from_this<SetTimePacket>
 {
 public:
 	__int64 time;

Minecraft.World/Network/Packets/SignUpdatePacket.h

@@ -3,7 +3,7 @@ using namespace std;
 
 #include "Packet.h"
 
-class SignUpdatePacket : public Packet, public enable_shared_from_this<SignUpdatePacket>
+class SignUpdatePacket : public Packet, public std::enable_shared_from_this<SignUpdatePacket>
 {
 public:
 	int x, y, z;

Minecraft.World/Network/Packets/TakeItemEntityPacket.h

@@ -3,7 +3,7 @@ using namespace std;
 
 #include "Packet.h"
 
-class TakeItemEntityPacket : public Packet, public enable_shared_from_this<TakeItemEntityPacket>
+class TakeItemEntityPacket : public Packet, public std::enable_shared_from_this<TakeItemEntityPacket>
 {
 public:
 	int itemId, playerId;

Minecraft.World/Network/Packets/TeleportEntityPacket.h

@@ -3,7 +3,7 @@ using namespace std;
 
 #include "Packet.h"
 
-class TeleportEntityPacket : public Packet, public enable_shared_from_this<TeleportEntityPacket>
+class TeleportEntityPacket : public Packet, public std::enable_shared_from_this<TeleportEntityPacket>
 {
 public:
 	int id;

Minecraft.World/Network/Packets/TextureAndGeometryChangePacket.h

@@ -3,7 +3,7 @@ using namespace std;
 
 #include "Packet.h"
 
-class TextureAndGeometryChangePacket : public Packet, public enable_shared_from_this<TextureAndGeometryChangePacket>
+class TextureAndGeometryChangePacket : public Packet, public std::enable_shared_from_this<TextureAndGeometryChangePacket>
 {
 public:
 

Minecraft.World/Network/Packets/TextureAndGeometryPacket.h

@@ -7,7 +7,7 @@ using namespace std;
 
 class DLCSkinFile;
 
-class TextureAndGeometryPacket : public Packet, public enable_shared_from_this<TextureAndGeometryPacket>
+class TextureAndGeometryPacket : public Packet, public std::enable_shared_from_this<TextureAndGeometryPacket>
 {
 public:
 	std::wstring textureName;

Minecraft.World/Network/Packets/TextureChangePacket.h

@@ -3,7 +3,7 @@ using namespace std;
 
 #include "Packet.h"
 
-class TextureChangePacket : public Packet, public enable_shared_from_this<TextureChangePacket>
+class TextureChangePacket : public Packet, public std::enable_shared_from_this<TextureChangePacket>
 {
 public:
 	enum ETextureChangeType

Minecraft.World/Network/Packets/TexturePacket.h

@@ -3,7 +3,7 @@ using namespace std;
 
 #include "Packet.h"
 
-class TexturePacket : public Packet, public enable_shared_from_this<TexturePacket>
+class TexturePacket : public Packet, public std::enable_shared_from_this<TexturePacket>
 {
 public:
 	std::wstring textureName;

Minecraft.World/Network/Packets/TileDestructionPacket.h

@@ -2,7 +2,7 @@
 
 #include "Packet.h"
 
-class TileDestructionPacket : public Packet, public enable_shared_from_this<TileDestructionPacket>
+class TileDestructionPacket : public Packet, public std::enable_shared_from_this<TileDestructionPacket>
 {
 private:
 	int id;

Minecraft.World/Network/Packets/TileEntityDataPacket.h

@@ -5,7 +5,7 @@ using namespace std;
 
 class CompoundTag;
 
-class TileEntityDataPacket : public Packet, public enable_shared_from_this<TileEntityDataPacket>
+class TileEntityDataPacket : public Packet, public std::enable_shared_from_this<TileEntityDataPacket>
 {
 public:
 	static const int TYPE_MOB_SPAWNER = 1;

Minecraft.World/Network/Packets/TileEventPacket.h

@@ -3,7 +3,7 @@ using namespace std;
 
 #include "Packet.h"
 
-class TileEventPacket : public Packet, public enable_shared_from_this<TileEventPacket>
+class TileEventPacket : public Packet, public std::enable_shared_from_this<TileEventPacket>
 {
 public:
 	int x, y, z, b0, b1, tile;

Minecraft.World/Network/Packets/TileUpdatePacket.h

@@ -3,7 +3,7 @@ using namespace std;
 
 #include "Packet.h"
 
-class TileUpdatePacket : public Packet, public enable_shared_from_this<TileUpdatePacket>
+class TileUpdatePacket : public Packet, public std::enable_shared_from_this<TileUpdatePacket>
 {
 public:
 	int x, y, z;

Minecraft.World/Network/Packets/TradeItemPacket.h

@@ -10,7 +10,7 @@ using namespace std;
 #include <iostream>
 #include "PacketListener.h"
 
-class TradeItemPacket : public Packet, public enable_shared_from_this<TradeItemPacket>
+class TradeItemPacket : public Packet, public std::enable_shared_from_this<TradeItemPacket>
 {
 public:
     int containerId;

Minecraft.World/Network/Packets/UpdateGameRuleProgressPacket.h

@@ -3,7 +3,7 @@ using namespace std;
 
 #include "Packet.h"
 
-class UpdateGameRuleProgressPacket : public Packet, public enable_shared_from_this<UpdateGameRuleProgressPacket>
+class UpdateGameRuleProgressPacket : public Packet, public std::enable_shared_from_this<UpdateGameRuleProgressPacket>
 {
 public:
 	ConsoleGameRules::EGameRuleType m_definitionType;

Minecraft.World/Network/Packets/UpdateMobEffectPacket.h

@@ -4,7 +4,7 @@
 
 class MobEffectInstance;
 
-class UpdateMobEffectPacket : public Packet, public enable_shared_from_this<UpdateMobEffectPacket>
+class UpdateMobEffectPacket : public Packet, public std::enable_shared_from_this<UpdateMobEffectPacket>
 {
 public:
 	int entityId;

Minecraft.World/Network/Packets/UpdateProgressPacket.h

@@ -5,7 +5,7 @@ using namespace std;
 
 // 4J Added packet to update clients on the time for the host to finish doing something
 
-class UpdateProgressPacket : public Packet, public enable_shared_from_this<UpdateProgressPacket>
+class UpdateProgressPacket : public Packet, public std::enable_shared_from_this<UpdateProgressPacket>
 {
 
 public:

Minecraft.World/Network/Packets/UseItemPacket.h

@@ -3,7 +3,7 @@ using namespace std;
 
 #include "Packet.h"
 
-class UseItemPacket : public Packet, public enable_shared_from_this<UseItemPacket>
+class UseItemPacket : public Packet, public std::enable_shared_from_this<UseItemPacket>
 {
 private:
 	static const float CLICK_ACCURACY;

Minecraft.World/Network/Packets/XZPacket.h

@@ -6,7 +6,7 @@ using namespace std;
 
 #include "Packet.h"
 
-class XZPacket : public Packet, public enable_shared_from_this<XZPacket>
+class XZPacket : public Packet, public std::enable_shared_from_this<XZPacket>
 {
 public:
 	static const int STRONGHOLD;