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, 9 insertions, 9 deletions

diff --git a/Minecraft.World/BrewingStandTile.cpp b/Minecraft.World/BrewingStandTile.cpp
index 5f09ba02..2a6fd2cd 100644
--- a/Minecraft.World/BrewingStandTile.cpp
+++ b/Minecraft.World/BrewingStandTile.cpp
@@ -29,9 +29,9 @@ int BrewingStandTile::getRenderShape()
 	return SHAPE_BREWING_STAND;
 }
 
-shared_ptr<TileEntity> BrewingStandTile::newTileEntity(Level *level)
+std::shared_ptr<TileEntity> BrewingStandTile::newTileEntity(Level *level)
 {
-	return shared_ptr<TileEntity>(new BrewingStandTileEntity());
+	return std::shared_ptr<TileEntity>(new BrewingStandTileEntity());
 }
 
 bool BrewingStandTile::isCubeShaped()
@@ -39,7 +39,7 @@ bool BrewingStandTile::isCubeShaped()
 	return false;
 }
 
-void BrewingStandTile::addAABBs(Level *level, int x, int y, int z, AABB *box, AABBList *boxes, shared_ptr<Entity> source)
+void BrewingStandTile::addAABBs(Level *level, int x, int y, int z, AABB *box, AABBList *boxes, std::shared_ptr<Entity> source)
 {
     setShape(7.0f / 16.0f, 0, 7.0f / 16.0f, 9.0f / 16.0f, 14.0f / 16.0f, 9.0f / 16.0f);
     EntityTile::addAABBs(level, x, y, z, box, boxes, source);
@@ -52,7 +52,7 @@ void BrewingStandTile::updateDefaultShape()
 	setShape(0, 0, 0, 1, 2.0f / 16.0f, 1);
 }
 
-bool BrewingStandTile::use(Level *level, int x, int y, int z, shared_ptr<Player> player, int clickedFace, float clickX, float clickY, float clickZ, bool soundOnly/*=false*/) // 4J added soundOnly param
+bool BrewingStandTile::use(Level *level, int x, int y, int z, std::shared_ptr<Player> player, int clickedFace, float clickX, float clickY, float clickZ, bool soundOnly/*=false*/) // 4J added soundOnly param
 {
 	if(soundOnly) return false;
 
@@ -60,7 +60,7 @@ bool BrewingStandTile::use(Level *level, int x, int y, int z, shared_ptr<Player>
 	{
         return true;
     }
-    shared_ptr<BrewingStandTileEntity> brewingStand = dynamic_pointer_cast<BrewingStandTileEntity>(level->getTileEntity(x, y, z));
+    std::shared_ptr<BrewingStandTileEntity> brewingStand = dynamic_pointer_cast<BrewingStandTileEntity>(level->getTileEntity(x, y, z));
     if (brewingStand != NULL) player->openBrewingStand(brewingStand);
 
 	return true;
@@ -78,13 +78,13 @@ void BrewingStandTile::animateTick(Level *level, int xt, int yt, int zt, Random
 
 void BrewingStandTile::onRemove(Level *level, int x, int y, int z, int id, int data)
 {
-    shared_ptr<TileEntity> tileEntity = level->getTileEntity(x, y, z);
+    std::shared_ptr<TileEntity> tileEntity = level->getTileEntity(x, y, z);
     if (tileEntity != NULL && ( dynamic_pointer_cast<BrewingStandTileEntity>(tileEntity) != NULL) )
 	{
-        shared_ptr<BrewingStandTileEntity> container = dynamic_pointer_cast<BrewingStandTileEntity>(tileEntity);
+        std::shared_ptr<BrewingStandTileEntity> container = dynamic_pointer_cast<BrewingStandTileEntity>(tileEntity);
         for (int i = 0; i < container->getContainerSize(); i++)
 		{
-            shared_ptr<ItemInstance> item = container->getItem(i);
+            std::shared_ptr<ItemInstance> item = container->getItem(i);
             if (item != NULL)
 			{
                 float xo = random->nextFloat() * 0.8f + 0.1f;
@@ -97,7 +97,7 @@ void BrewingStandTile::onRemove(Level *level, int x, int y, int z, int id, int d
                     if (count > item->count) count = item->count;
                     item->count -= count;
 
-                    shared_ptr<ItemEntity> itemEntity = shared_ptr<ItemEntity>(new ItemEntity(level, x + xo, y + yo, z + zo, shared_ptr<ItemInstance>( new ItemInstance(item->id, count, item->getAuxValue()))));
+                    std::shared_ptr<ItemEntity> itemEntity = std::shared_ptr<ItemEntity>(new ItemEntity(level, x + xo, y + yo, z + zo, std::shared_ptr<ItemInstance>( new ItemInstance(item->id, count, item->getAuxValue()))));
                     float pow = 0.05f;
                     itemEntity->xd = (float) random->nextGaussian() * pow;
                     itemEntity->yd = (float) random->nextGaussian() * pow + 0.2f;