Revert "shared_ptr -> std::shared_ptr"

This reverts commit 7074f35e4ba831e358117842b99ee35b87f85ae5.

1 files changed, 8 insertions, 8 deletions

diff --git a/Minecraft.World/MerchantContainer.h b/Minecraft.World/MerchantContainer.h
index 9f4efe33..efba13d6 100644
--- a/Minecraft.World/MerchantContainer.h
+++ b/Minecraft.World/MerchantContainer.h
@@ -10,29 +10,29 @@ class MerchantRecipe;
 class MerchantContainer : public Container
 {
 private:
-	std::shared_ptr<Merchant> merchant;
+	shared_ptr<Merchant> merchant;
 	ItemInstanceArray items;
-	std::shared_ptr<Player> player;
+	shared_ptr<Player> player;
 	MerchantRecipe *activeRecipe;
 	int selectionHint;
 
 public:
-	MerchantContainer(std::shared_ptr<Player> player, std::shared_ptr<Merchant> villager);
+	MerchantContainer(shared_ptr<Player> player, shared_ptr<Merchant> villager);
 	~MerchantContainer();
 
 	unsigned int getContainerSize();
-	std::shared_ptr<ItemInstance> getItem(unsigned int slot);
-	std::shared_ptr<ItemInstance> removeItem(unsigned int slot, int count);
+	shared_ptr<ItemInstance> getItem(unsigned int slot);
+	shared_ptr<ItemInstance> removeItem(unsigned int slot, int count);
 
 private:
 	bool isPaymentSlot(int slot);
 
 public:
-	std::shared_ptr<ItemInstance> removeItemNoUpdate(int slot);
-	void setItem(unsigned int slot, std::shared_ptr<ItemInstance> item);
+	shared_ptr<ItemInstance> removeItemNoUpdate(int slot);
+	void setItem(unsigned int slot, shared_ptr<ItemInstance> item);
 	int getName();
 	int getMaxStackSize();
-	bool stillValid(std::shared_ptr<Player> player);
+	bool stillValid(shared_ptr<Player> player);
 	void startOpen();
 	void stopOpen();
 	void setChanged();