Revert "shared_ptr -> std::shared_ptr"

This reverts commit 7074f35e4ba831e358117842b99ee35b87f85ae5.

1 files changed, 10 insertions, 10 deletions

diff --git a/Minecraft.World/MerchantRecipe.cpp b/Minecraft.World/MerchantRecipe.cpp
index 84fdc744..b772b0c7 100644
--- a/Minecraft.World/MerchantRecipe.cpp
+++ b/Minecraft.World/MerchantRecipe.cpp
@@ -2,7 +2,7 @@
 
 #include "MerchantRecipe.h"
 
-void MerchantRecipe::_init(std::shared_ptr<ItemInstance> buyA, std::shared_ptr<ItemInstance> buyB, std::shared_ptr<ItemInstance> sell)
+void MerchantRecipe::_init(shared_ptr<ItemInstance> buyA, shared_ptr<ItemInstance> buyB, shared_ptr<ItemInstance> sell)
 {
 	this->buyA = buyA;
 	this->buyB = buyB;
@@ -20,34 +20,34 @@ MerchantRecipe::MerchantRecipe(CompoundTag *tag)
 	load(tag);
 }
 
-MerchantRecipe::MerchantRecipe(std::shared_ptr<ItemInstance> buyA, std::shared_ptr<ItemInstance> buyB, std::shared_ptr<ItemInstance> sell, int uses, int maxUses)
+MerchantRecipe::MerchantRecipe(shared_ptr<ItemInstance> buyA, shared_ptr<ItemInstance> buyB, shared_ptr<ItemInstance> sell, int uses, int maxUses)
 {
 	_init(buyA, buyB, sell);
 	this->uses = uses;
 	this->maxUses = maxUses;
 }
 
-MerchantRecipe::MerchantRecipe(std::shared_ptr<ItemInstance> buy, std::shared_ptr<ItemInstance> sell)
+MerchantRecipe::MerchantRecipe(shared_ptr<ItemInstance> buy, shared_ptr<ItemInstance> sell)
 {
 	_init(buy, nullptr, sell);
 }
 
-MerchantRecipe::MerchantRecipe(std::shared_ptr<ItemInstance> buy, Item *sell)
+MerchantRecipe::MerchantRecipe(shared_ptr<ItemInstance> buy, Item *sell)
 {
-	_init(buy, nullptr, std::shared_ptr<ItemInstance>(new ItemInstance(sell)));
+	_init(buy, nullptr, shared_ptr<ItemInstance>(new ItemInstance(sell)));
 }
 
-MerchantRecipe::MerchantRecipe(std::shared_ptr<ItemInstance> buy, Tile *sell)
+MerchantRecipe::MerchantRecipe(shared_ptr<ItemInstance> buy, Tile *sell)
 {
-	_init(buy, nullptr, std::shared_ptr<ItemInstance>(new ItemInstance(sell)));
+	_init(buy, nullptr, shared_ptr<ItemInstance>(new ItemInstance(sell)));
 }
 
-std::shared_ptr<ItemInstance> MerchantRecipe::getBuyAItem()
+shared_ptr<ItemInstance> MerchantRecipe::getBuyAItem()
 {
 	return buyA;
 }
 
-std::shared_ptr<ItemInstance> MerchantRecipe::getBuyBItem()
+shared_ptr<ItemInstance> MerchantRecipe::getBuyBItem()
 {
 	return buyB;
 }
@@ -57,7 +57,7 @@ bool MerchantRecipe::hasSecondaryBuyItem()
 	return buyB != NULL;
 }
 
-std::shared_ptr<ItemInstance> MerchantRecipe::getSellItem()
+shared_ptr<ItemInstance> MerchantRecipe::getSellItem()
 {
 	return sell;
 }