From 46398f4671012a0d913bd7bc0c70ffdc2645f2ac Mon Sep 17 00:00:00 2001 From: Mattes D Date: Sat, 1 Aug 2020 20:18:03 +0200 Subject: Replaced cpp14::make_unique<> with std::make_unique<>. --- src/Generating/PieceGeneratorBFSTree.cpp | 2 +- src/Generating/PrefabPiecePool.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/Generating') diff --git a/src/Generating/PieceGeneratorBFSTree.cpp b/src/Generating/PieceGeneratorBFSTree.cpp index b6929d4b0..4d9c78b45 100644 --- a/src/Generating/PieceGeneratorBFSTree.cpp +++ b/src/Generating/PieceGeneratorBFSTree.cpp @@ -177,7 +177,7 @@ bool cPieceGeneratorBFSTree::TryPlacePieceAtConnector( // Place the piece: Vector3i NewPos = Conn.m_Piece->RotatePos(Conn.m_Connector.m_Pos, Conn.m_NumCCWRotations); ConnPos -= NewPos; - auto PlacedPiece = cpp14::make_unique(&a_ParentPiece, *(Conn.m_Piece), ConnPos, Conn.m_NumCCWRotations); + auto PlacedPiece = std::make_unique(&a_ParentPiece, *(Conn.m_Piece), ConnPos, Conn.m_NumCCWRotations); // Add the new piece's connectors to the list of free connectors: cPiece::cConnectors Connectors = Conn.m_Piece->GetConnectors(); diff --git a/src/Generating/PrefabPiecePool.cpp b/src/Generating/PrefabPiecePool.cpp index d984912cb..e52bb1621 100644 --- a/src/Generating/PrefabPiecePool.cpp +++ b/src/Generating/PrefabPiecePool.cpp @@ -398,7 +398,7 @@ std::unique_ptr cPrefabPiecePool::LoadPrefabFromCubesetVer1( ); return nullptr; } - return cpp14::make_unique(area); + return std::make_unique(area); } // if (SchematicFileName) // There's no referenced schematic file, load from BlockDefinitions / BlockData. @@ -452,7 +452,7 @@ std::unique_ptr cPrefabPiecePool::LoadPrefabFromCubesetVer1( return nullptr; } - return cpp14::make_unique(BlockDefStr, BlockDataStr, SizeX, SizeY, SizeZ); + return std::make_unique(BlockDefStr, BlockDataStr, SizeX, SizeY, SizeZ); } -- cgit v1.2.3