From 7074f35e4ba831e358117842b99ee35b87f85ae5 Mon Sep 17 00:00:00 2001 From: void_17 Date: Mon, 2 Mar 2026 15:58:20 +0700 Subject: 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. --- Minecraft.World/ClientSideMerchant.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'Minecraft.World/ClientSideMerchant.h') diff --git a/Minecraft.World/ClientSideMerchant.h b/Minecraft.World/ClientSideMerchant.h index 33f0c0b1..fa02c486 100644 --- a/Minecraft.World/ClientSideMerchant.h +++ b/Minecraft.World/ClientSideMerchant.h @@ -10,21 +10,21 @@ class ClientSideMerchant : public Merchant, public enable_shared_from_this source; + std::shared_ptr source; MerchantRecipeList *currentOffers; int m_name; public: - ClientSideMerchant(shared_ptr source, int name); + ClientSideMerchant(std::shared_ptr source, int name); ~ClientSideMerchant(); void createContainer(); // 4J Added Container *getContainer(); - shared_ptr getTradingPlayer(); - void setTradingPlayer(shared_ptr player); - MerchantRecipeList *getOffers(shared_ptr forPlayer); + std::shared_ptr getTradingPlayer(); + void setTradingPlayer(std::shared_ptr player); + MerchantRecipeList *getOffers(std::shared_ptr forPlayer); void overrideOffers(MerchantRecipeList *recipeList); void notifyTrade(MerchantRecipe *activeRecipe); - void notifyTradeUpdated(shared_ptr item); + void notifyTradeUpdated(std::shared_ptr item); int getDisplayName(); }; \ No newline at end of file -- cgit v1.2.3