shared_ptr -> std::shared_ptr

This is one of the first commits in a plan to remove all `using namespace std;` lines in the entire codebase as it is considered anti-pattern today.

1 files changed, 9 insertions, 9 deletions

diff --git a/Minecraft.World/MapItemSavedData.h b/Minecraft.World/MapItemSavedData.h
index fcbe5e30..79e85132 100644
--- a/Minecraft.World/MapItemSavedData.h
+++ b/Minecraft.World/MapItemSavedData.h
@@ -28,7 +28,7 @@ public:
 	class HoldingPlayer
 	{
 	public:
-		const shared_ptr<Player> player;
+		const std::shared_ptr<Player> player;
 		intArray rowsDirtyMin;
 		intArray rowsDirtyMax;
 
@@ -42,9 +42,9 @@ public:
 
 	public:
 		// 4J Stu - Had to add a reference to the MapItemSavedData object that created us as we try to access it's member variables
-		HoldingPlayer(shared_ptr<Player> player, const MapItemSavedData *parent);
+		HoldingPlayer(std::shared_ptr<Player> player, const MapItemSavedData *parent);
 		~HoldingPlayer();
-		charArray nextUpdatePacket(shared_ptr<ItemInstance> itemInstance);
+		charArray nextUpdatePacket(std::shared_ptr<ItemInstance> itemInstance);
 	};
 
 public:
@@ -53,10 +53,10 @@ public:
 	byte scale;
 	byteArray colors;
 	int step;
-	vector<shared_ptr<HoldingPlayer> > carriedBy;
+	vector<std::shared_ptr<HoldingPlayer> > carriedBy;
 
 private:
-	typedef unordered_map<shared_ptr<Player> , shared_ptr<HoldingPlayer> , PlayerKeyHash, PlayerKeyEq> playerHoldingPlayerMapType;
+	typedef unordered_map<std::shared_ptr<Player> , std::shared_ptr<HoldingPlayer> , PlayerKeyHash, PlayerKeyEq> playerHoldingPlayerMapType;
 	playerHoldingPlayerMapType carriedByPlayers;
 
 public:
@@ -75,15 +75,15 @@ public:
 	virtual void load(CompoundTag *tag);
 	virtual void save(CompoundTag *tag);
 
-	void tickCarriedBy(shared_ptr<Player> player, shared_ptr<ItemInstance> item);
+	void tickCarriedBy(std::shared_ptr<Player> player, std::shared_ptr<ItemInstance> item);
 
-	charArray getUpdatePacket(shared_ptr<ItemInstance> itemInstance, Level *level, shared_ptr<Player> player);
+	charArray getUpdatePacket(std::shared_ptr<ItemInstance> itemInstance, Level *level, std::shared_ptr<Player> player);
 
 	using SavedData::setDirty;
 	void setDirty(int x, int y0, int y1);
 	void handleComplexItemData(charArray &data);
 
 	// 4J Stu Added
-	void mergeInMapData(shared_ptr<MapItemSavedData> dataToAdd);
-	void removeItemFrameDecoration(shared_ptr<ItemInstance> item);
+	void mergeInMapData(std::shared_ptr<MapItemSavedData> dataToAdd);
+	void removeItemFrameDecoration(std::shared_ptr<ItemInstance> item);
 };