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.

1 files changed, 19 insertions, 19 deletions

diff --git a/Minecraft.Client/ServerPlayer.h b/Minecraft.Client/ServerPlayer.h
index a9b37594..1e896ec0 100644
--- a/Minecraft.Client/ServerPlayer.h
+++ b/Minecraft.Client/ServerPlayer.h
@@ -17,7 +17,7 @@ class ServerPlayer : public Player, public net_minecraft_world_inventory::Contai
 {
 public:
 	eINSTANCEOF GetType() { return eTYPE_SERVERPLAYER; }
-	shared_ptr<PlayerConnection> connection;
+	std::shared_ptr<PlayerConnection> connection;
     MinecraftServer *server;
     ServerPlayerGameMode *gameMode;
     double lastMoveX, lastMoveZ;
@@ -59,7 +59,7 @@ public:
 	virtual float getHeadHeight();
     virtual void tick();
 	void flushEntitiesToRemove();
-    virtual shared_ptr<ItemInstance> getCarried(int slot);
+    virtual std::shared_ptr<ItemInstance> getCarried(int slot);
     virtual void die(DamageSource *source);
     virtual bool hurt(DamageSource *dmgSource, int dmg);
 	virtual bool isPlayerVersusPlayer();
@@ -69,15 +69,15 @@ public:
 	void doTickB(bool ignorePortal);
 	virtual void changeDimension(int i);
 private:
-	void broadcast(shared_ptr<TileEntity> te, bool delay = false);
+	void broadcast(std::shared_ptr<TileEntity> te, bool delay = false);
 public:
-    virtual void take(shared_ptr<Entity> e, int orgCount);
+    virtual void take(std::shared_ptr<Entity> e, int orgCount);
     virtual void swing();
 	virtual BedSleepingResult startSleepInBed(int x, int y, int z, bool bTestUse = false);
 
 public:
 	virtual void stopSleepInBed(bool forcefulWakeUp, bool updateLevelList, bool saveRespawnPoint);
-    virtual void ride(shared_ptr<Entity> e);
+    virtual void ride(std::shared_ptr<Entity> e);
 protected:
 	virtual void checkFallDamage(double ya, bool onGround);
 public:
@@ -97,14 +97,14 @@ public:
 	virtual bool startCrafting(int x, int y, int z);					// 4J added bool return
 	virtual bool startEnchanting(int x, int y, int z);					// 4J added bool return
 	virtual bool startRepairing(int x, int y, int z);					// 4J added bool return
-    virtual bool openContainer(shared_ptr<Container> container);		// 4J added bool return
-    virtual bool openFurnace(shared_ptr<FurnaceTileEntity> furnace);	// 4J added bool return
-    virtual bool openTrap(shared_ptr<DispenserTileEntity> trap);		// 4J added bool return
-	virtual bool openBrewingStand(shared_ptr<BrewingStandTileEntity> brewingStand); // 4J added bool return
-	virtual bool openTrading(shared_ptr<Merchant> traderTarget); // 4J added bool return
-    virtual void slotChanged(AbstractContainerMenu *container, int slotIndex, shared_ptr<ItemInstance> item);
+    virtual bool openContainer(std::shared_ptr<Container> container);		// 4J added bool return
+    virtual bool openFurnace(std::shared_ptr<FurnaceTileEntity> furnace);	// 4J added bool return
+    virtual bool openTrap(std::shared_ptr<DispenserTileEntity> trap);		// 4J added bool return
+	virtual bool openBrewingStand(std::shared_ptr<BrewingStandTileEntity> brewingStand); // 4J added bool return
+	virtual bool openTrading(std::shared_ptr<Merchant> traderTarget); // 4J added bool return
+    virtual void slotChanged(AbstractContainerMenu *container, int slotIndex, std::shared_ptr<ItemInstance> item);
     void refreshContainer(AbstractContainerMenu *menu);
-    virtual void refreshContainer(AbstractContainerMenu *container, vector<shared_ptr<ItemInstance> > *items);
+    virtual void refreshContainer(AbstractContainerMenu *container, vector<std::shared_ptr<ItemInstance> > *items);
     virtual void setContainerData(AbstractContainerMenu *container, int id, int value);
     virtual void closeContainer();
     void broadcastCarriedItem();
@@ -121,8 +121,8 @@ protected:
 	virtual void completeUsingItem();
 
 public:
-	virtual void startUsingItem(shared_ptr<ItemInstance> instance, int duration);
-	virtual void restoreFrom(shared_ptr<Player> oldPlayer, bool restoreAll);
+	virtual void startUsingItem(std::shared_ptr<ItemInstance> instance, int duration);
+	virtual void restoreFrom(std::shared_ptr<Player> oldPlayer, bool restoreAll);
 
 protected:
 	virtual void onEffectAdded(MobEffectInstance *effect);
@@ -131,8 +131,8 @@ protected:
 
 public:
 	virtual void teleportTo(double x, double y, double z);
-    virtual void crit(shared_ptr<Entity> entity);
-    virtual void magicCrit(shared_ptr<Entity> entity);
+    virtual void crit(std::shared_ptr<Entity> entity);
+    virtual void magicCrit(std::shared_ptr<Entity> entity);
 
 	void onUpdateAbilities();
 	ServerLevel *getLevel();
@@ -140,7 +140,7 @@ public:
 	void sendMessage(const wstring& message, ChatPacket::EChatPacketMessage type = ChatPacket::e_ChatCustom, int customData = -1, const wstring& additionalMessage = L"");
 	bool hasPermission(EGameCommand command);
 	// 4J - Don't use
-	//void updateOptions(shared_ptr<ClientInformationPacket> packet);
+	//void updateOptions(std::shared_ptr<ClientInformationPacket> packet);
 	int getViewDistance();
 	//bool canChatInColor();
 	//int getChatVisibility();
@@ -152,7 +152,7 @@ public:
 
 public:
 	// 4J Stu - Added hooks for the game rules
-	virtual void handleCollectItem(shared_ptr<ItemInstance> item);
+	virtual void handleCollectItem(std::shared_ptr<ItemInstance> item);
 
 #ifndef _CONTENT_PACKAGE
 	void debug_setPosition(double,double,double,double,double);
@@ -160,5 +160,5 @@ public:
 
 protected:
 	// 4J Added to record telemetry of player deaths, this should store the last source of damage
-	ETelemetryChallenges m_lastDamageSource;	
+	ETelemetryChallenges m_lastDamageSource;
 };