Revert "shared_ptr -> std::shared_ptr"

This reverts commit 7074f35e4ba831e358117842b99ee35b87f85ae5.

1 files changed, 6 insertions, 6 deletions

diff --git a/Minecraft.World/ClientSideMerchant.h b/Minecraft.World/ClientSideMerchant.h
index fa02c486..33f0c0b1 100644
--- a/Minecraft.World/ClientSideMerchant.h
+++ b/Minecraft.World/ClientSideMerchant.h
@@ -10,21 +10,21 @@ class ClientSideMerchant : public Merchant, public enable_shared_from_this<Clien
 {
 private:
 	MerchantContainer *container;
-    std::shared_ptr<Player> source;
+    shared_ptr<Player> source;
     MerchantRecipeList *currentOffers;
 	int m_name;
 
 public:
-	ClientSideMerchant(std::shared_ptr<Player> source, int name);
+	ClientSideMerchant(shared_ptr<Player> source, int name);
 	~ClientSideMerchant();
 
 	void createContainer(); // 4J Added
     Container *getContainer();
-    std::shared_ptr<Player> getTradingPlayer();
-    void setTradingPlayer(std::shared_ptr<Player> player);
-    MerchantRecipeList *getOffers(std::shared_ptr<Player> forPlayer);
+    shared_ptr<Player> getTradingPlayer();
+    void setTradingPlayer(shared_ptr<Player> player);
+    MerchantRecipeList *getOffers(shared_ptr<Player> forPlayer);
     void overrideOffers(MerchantRecipeList *recipeList);
     void notifyTrade(MerchantRecipe *activeRecipe);
-	void notifyTradeUpdated(std::shared_ptr<ItemInstance> item);
+	void notifyTradeUpdated(shared_ptr<ItemInstance> item);
 	int getDisplayName();
 };
\ No newline at end of file