From a56cfd1f42663856e346a26cbad401aec07bed91 Mon Sep 17 00:00:00 2001 From: peterbell10 Date: Thu, 20 Jul 2017 12:19:18 +0100 Subject: Remove smart pointer macros --- src/Generating/ComposableGenerator.h | 10 +++++----- src/Generating/GridStructGen.h | 2 +- src/Generating/HeiGen.cpp | 2 +- src/Generating/HeiGen.h | 2 +- src/Generating/PiecePool.h | 4 ++-- src/Generating/PieceStructuresGen.h | 2 +- src/Generating/PrefabPiecePool.cpp | 2 +- src/Generating/PrefabPiecePool.h | 2 +- src/Generating/ShapeGen.cpp | 2 +- src/Generating/VillageGen.cpp | 2 +- src/Generating/VillageGen.h | 2 +- 11 files changed, 16 insertions(+), 16 deletions(-) (limited to 'src/Generating') diff --git a/src/Generating/ComposableGenerator.h b/src/Generating/ComposableGenerator.h index 056303db1..0b7e795d2 100644 --- a/src/Generating/ComposableGenerator.h +++ b/src/Generating/ComposableGenerator.h @@ -30,11 +30,11 @@ class cTerrainShapeGen; class cTerrainHeightGen; class cTerrainCompositionGen; class cFinishGen; -typedef SharedPtr cBiomeGenPtr; -typedef SharedPtr cTerrainShapeGenPtr; -typedef SharedPtr cTerrainHeightGenPtr; -typedef SharedPtr cTerrainCompositionGenPtr; -typedef SharedPtr cFinishGenPtr; +typedef std::shared_ptr cBiomeGenPtr; +typedef std::shared_ptr cTerrainShapeGenPtr; +typedef std::shared_ptr cTerrainHeightGenPtr; +typedef std::shared_ptr cTerrainCompositionGenPtr; +typedef std::shared_ptr cFinishGenPtr; diff --git a/src/Generating/GridStructGen.h b/src/Generating/GridStructGen.h index 30cb9d670..49d138217 100644 --- a/src/Generating/GridStructGen.h +++ b/src/Generating/GridStructGen.h @@ -74,7 +74,7 @@ public: /** Returns the cost of keeping this structure in the cache */ virtual size_t GetCacheCost(void) const { return 1; } } ; - typedef SharedPtr cStructurePtr; + typedef std::shared_ptr cStructurePtr; typedef std::list cStructurePtrs; diff --git a/src/Generating/HeiGen.cpp b/src/Generating/HeiGen.cpp index b724a1dde..42df16e73 100644 --- a/src/Generating/HeiGen.cpp +++ b/src/Generating/HeiGen.cpp @@ -68,7 +68,7 @@ public: protected: int m_Seed; - SharedPtr m_Gen; + std::shared_ptr m_Gen; }; diff --git a/src/Generating/HeiGen.h b/src/Generating/HeiGen.h index 0f7b59093..24fe7e82e 100644 --- a/src/Generating/HeiGen.h +++ b/src/Generating/HeiGen.h @@ -79,7 +79,7 @@ public: bool GetHeightAt(int a_ChunkX, int a_ChunkZ, int a_RelX, int a_RelZ, HEIGHTTYPE & a_Height); protected: - typedef SharedPtr cHeiGenCachePtr; + typedef std::shared_ptr cHeiGenCachePtr; typedef std::vector cHeiGenCachePtrs; diff --git a/src/Generating/PiecePool.h b/src/Generating/PiecePool.h index 84f511950..0c1a701f9 100644 --- a/src/Generating/PiecePool.h +++ b/src/Generating/PiecePool.h @@ -118,7 +118,7 @@ public: virtual void AssignGens(int a_Seed, cBiomeGenPtr & a_BiomeGen, cTerrainHeightGenPtr & a_TerrainHeightGen, int a_SeaLevel) {} }; - typedef SharedPtr cVerticalStrategyPtr; + typedef std::shared_ptr cVerticalStrategyPtr; /** Base class (interface) for the vertical limit of piece placement. @@ -145,7 +145,7 @@ public: virtual void AssignGens(int a_Seed, cBiomeGenPtr & a_BiomeGen, cTerrainHeightGenPtr & a_TerrainHeightGen, int a_SeaLevel) {} }; - typedef SharedPtr cVerticalLimitPtr; + typedef std::shared_ptr cVerticalLimitPtr; /** The strategy used for vertical placement of this piece when it is used as a starting piece. */ diff --git a/src/Generating/PieceStructuresGen.h b/src/Generating/PieceStructuresGen.h index 0e36fe9d5..e3bd1bb59 100644 --- a/src/Generating/PieceStructuresGen.h +++ b/src/Generating/PieceStructuresGen.h @@ -44,7 +44,7 @@ protected: Forward-declared so that its implementation changes don't affect the header. */ class cGen; - typedef SharedPtr cGenPtr; + typedef std::shared_ptr cGenPtr; typedef std::vector cGenPtrs; diff --git a/src/Generating/PrefabPiecePool.cpp b/src/Generating/PrefabPiecePool.cpp index 9c4e24e92..551b81376 100644 --- a/src/Generating/PrefabPiecePool.cpp +++ b/src/Generating/PrefabPiecePool.cpp @@ -372,7 +372,7 @@ bool cPrefabPiecePool::LoadCubesetPieceVer1(const AString & a_FileName, cLuaStat -UniquePtr cPrefabPiecePool::LoadPrefabFromCubesetVer1( +std::unique_ptr cPrefabPiecePool::LoadPrefabFromCubesetVer1( const AString & a_FileName, cLuaState & a_LuaState, const AString & a_PieceName, diff --git a/src/Generating/PrefabPiecePool.h b/src/Generating/PrefabPiecePool.h index 14df221c6..425b64607 100644 --- a/src/Generating/PrefabPiecePool.h +++ b/src/Generating/PrefabPiecePool.h @@ -190,7 +190,7 @@ protected: Returns the prefab on success, nullptr on failure. a_PieceName is the identification of the piece, used for logging only. If a_LogWarnings is true, logs a warning to console when loading fails. */ - UniquePtr LoadPrefabFromCubesetVer1( + std::unique_ptr LoadPrefabFromCubesetVer1( const AString & a_FileName, cLuaState & a_LuaState, const AString & a_PieceName, diff --git a/src/Generating/ShapeGen.cpp b/src/Generating/ShapeGen.cpp index e3de6e733..2e764a530 100644 --- a/src/Generating/ShapeGen.cpp +++ b/src/Generating/ShapeGen.cpp @@ -66,7 +66,7 @@ protected: cTerrainHeightGenPtr m_HeightGen; }; -typedef SharedPtr cTerrainHeightToShapeGenPtr; +typedef std::shared_ptr cTerrainHeightToShapeGenPtr; diff --git a/src/Generating/VillageGen.cpp b/src/Generating/VillageGen.cpp index 1b6f012db..bf1fee2e8 100644 --- a/src/Generating/VillageGen.cpp +++ b/src/Generating/VillageGen.cpp @@ -381,7 +381,7 @@ cGridStructGen::cStructurePtr cVillageGen::CreateStructure(int a_GridX, int a_Gr { auto biome = Biomes[i]; availablePools.erase(std::remove_if(availablePools.begin(), availablePools.end(), - [biome](SharedPtr a_Pool) + [biome](std::shared_ptr & a_Pool) { return !a_Pool->IsBiomeAllowed(biome); }), diff --git a/src/Generating/VillageGen.h b/src/Generating/VillageGen.h index a7fc1b255..9de8552b1 100644 --- a/src/Generating/VillageGen.h +++ b/src/Generating/VillageGen.h @@ -44,7 +44,7 @@ public: protected: class cVillage; // fwd: VillageGen.cpp - typedef std::vector > cVillagePiecePools; + typedef std::vector> cVillagePiecePools; /** The noise used for generating random numbers */ cNoise m_RandNoise; -- cgit v1.2.3