Revert "shared_ptr -> std::shared_ptr"

This reverts commit 7074f35e4ba831e358117842b99ee35b87f85ae5.

1 files changed, 11 insertions, 11 deletions

diff --git a/Minecraft.World/MerchantRecipe.h b/Minecraft.World/MerchantRecipe.h
index dd684b6a..0ed84898 100644
--- a/Minecraft.World/MerchantRecipe.h
+++ b/Minecraft.World/MerchantRecipe.h
@@ -3,25 +3,25 @@
 class MerchantRecipe
 {
 private:
-	std::shared_ptr<ItemInstance> buyA;
-	std::shared_ptr<ItemInstance> buyB;
-	std::shared_ptr<ItemInstance> sell;
+	shared_ptr<ItemInstance> buyA;
+	shared_ptr<ItemInstance> buyB;
+	shared_ptr<ItemInstance> sell;
 	int uses;
 	int maxUses;
 
-	void _init(std::shared_ptr<ItemInstance> buyA, std::shared_ptr<ItemInstance> buyB, std::shared_ptr<ItemInstance> sell);
+	void _init(shared_ptr<ItemInstance> buyA, shared_ptr<ItemInstance> buyB, shared_ptr<ItemInstance> sell);
 
 public:
 	MerchantRecipe(CompoundTag *tag);
-	MerchantRecipe(std::shared_ptr<ItemInstance> buyA, std::shared_ptr<ItemInstance> buyB, std::shared_ptr<ItemInstance> sell, int uses = 0, int maxUses = 7);
-	MerchantRecipe(std::shared_ptr<ItemInstance> buy, std::shared_ptr<ItemInstance> sell);
-	MerchantRecipe(std::shared_ptr<ItemInstance> buy, Item *sell);
-	MerchantRecipe(std::shared_ptr<ItemInstance> buy, Tile *sell);
+	MerchantRecipe(shared_ptr<ItemInstance> buyA, shared_ptr<ItemInstance> buyB, shared_ptr<ItemInstance> sell, int uses = 0, int maxUses = 7);
+	MerchantRecipe(shared_ptr<ItemInstance> buy, shared_ptr<ItemInstance> sell);
+	MerchantRecipe(shared_ptr<ItemInstance> buy, Item *sell);
+	MerchantRecipe(shared_ptr<ItemInstance> buy, Tile *sell);
 
-	std::shared_ptr<ItemInstance> getBuyAItem();
-	std::shared_ptr<ItemInstance> getBuyBItem();
+	shared_ptr<ItemInstance> getBuyAItem();
+	shared_ptr<ItemInstance> getBuyBItem();
 	bool hasSecondaryBuyItem();
-	std::shared_ptr<ItemInstance> getSellItem();
+	shared_ptr<ItemInstance> getSellItem();
 	bool isSame(MerchantRecipe *other);
 	bool isSameSameButBetter(MerchantRecipe *other);
 	int getUses();