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/MapItemSavedData.h | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'Minecraft.World/MapItemSavedData.h') diff --git a/Minecraft.World/MapItemSavedData.h b/Minecraft.World/MapItemSavedData.h index fcbe5e30..79e85132 100644 --- a/Minecraft.World/MapItemSavedData.h +++ b/Minecraft.World/MapItemSavedData.h @@ -28,7 +28,7 @@ public: class HoldingPlayer { public: - const shared_ptr player; + const std::shared_ptr player; intArray rowsDirtyMin; intArray rowsDirtyMax; @@ -42,9 +42,9 @@ public: public: // 4J Stu - Had to add a reference to the MapItemSavedData object that created us as we try to access it's member variables - HoldingPlayer(shared_ptr player, const MapItemSavedData *parent); + HoldingPlayer(std::shared_ptr player, const MapItemSavedData *parent); ~HoldingPlayer(); - charArray nextUpdatePacket(shared_ptr itemInstance); + charArray nextUpdatePacket(std::shared_ptr itemInstance); }; public: @@ -53,10 +53,10 @@ public: byte scale; byteArray colors; int step; - vector > carriedBy; + vector > carriedBy; private: - typedef unordered_map , shared_ptr , PlayerKeyHash, PlayerKeyEq> playerHoldingPlayerMapType; + typedef unordered_map , std::shared_ptr , PlayerKeyHash, PlayerKeyEq> playerHoldingPlayerMapType; playerHoldingPlayerMapType carriedByPlayers; public: @@ -75,15 +75,15 @@ public: virtual void load(CompoundTag *tag); virtual void save(CompoundTag *tag); - void tickCarriedBy(shared_ptr player, shared_ptr item); + void tickCarriedBy(std::shared_ptr player, std::shared_ptr item); - charArray getUpdatePacket(shared_ptr itemInstance, Level *level, shared_ptr player); + charArray getUpdatePacket(std::shared_ptr itemInstance, Level *level, std::shared_ptr player); using SavedData::setDirty; void setDirty(int x, int y0, int y1); void handleComplexItemData(charArray &data); // 4J Stu Added - void mergeInMapData(shared_ptr dataToAdd); - void removeItemFrameDecoration(shared_ptr item); + void mergeInMapData(std::shared_ptr dataToAdd); + void removeItemFrameDecoration(std::shared_ptr item); }; -- cgit v1.2.3