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, 10 insertions, 10 deletions

diff --git a/Minecraft.World/MerchantResultSlot.h b/Minecraft.World/MerchantResultSlot.h
index 7b8d97b6..1b45082c 100644
--- a/Minecraft.World/MerchantResultSlot.h
+++ b/Minecraft.World/MerchantResultSlot.h
@@ -9,25 +9,25 @@ class Merchant;
 class MerchantResultSlot : public Slot
 {
 private:
-	shared_ptr<MerchantContainer> slots;
+	std::shared_ptr<MerchantContainer> slots;
 	Player *player;
 	int removeCount;
-	shared_ptr<Merchant> merchant;
+	std::shared_ptr<Merchant> merchant;
 
 public:
-	MerchantResultSlot(Player *player, shared_ptr<Merchant> merchant, shared_ptr<MerchantContainer> slots, int id, int x, int y);
+	MerchantResultSlot(Player *player, std::shared_ptr<Merchant> merchant, std::shared_ptr<MerchantContainer> slots, int id, int x, int y);
 
-	bool mayPlace(shared_ptr<ItemInstance> item);
-	shared_ptr<ItemInstance> remove(int c);
+	bool mayPlace(std::shared_ptr<ItemInstance> item);
+	std::shared_ptr<ItemInstance> remove(int c);
 
 protected:
-	void onQuickCraft(shared_ptr<ItemInstance> picked, int count);
-	void checkTakeAchievements(shared_ptr<ItemInstance> carried);
+	void onQuickCraft(std::shared_ptr<ItemInstance> picked, int count);
+	void checkTakeAchievements(std::shared_ptr<ItemInstance> carried);
 
 public:
-	void onTake(shared_ptr<Player> player, shared_ptr<ItemInstance> carried);
-	virtual bool mayCombine(shared_ptr<ItemInstance> item); // 4J Added
+	void onTake(std::shared_ptr<Player> player, std::shared_ptr<ItemInstance> carried);
+	virtual bool mayCombine(std::shared_ptr<ItemInstance> item); // 4J Added
 
 private:
-	bool removePaymentItemsIfMatching(MerchantRecipe *activeRecipe, shared_ptr<ItemInstance> a, shared_ptr<ItemInstance> b);
+	bool removePaymentItemsIfMatching(MerchantRecipe *activeRecipe, std::shared_ptr<ItemInstance> a, std::shared_ptr<ItemInstance> b);
 };
\ No newline at end of file