summaryrefslogtreecommitdiffstats
path: root/src/Bindings
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/Bindings/LuaState.cpp10
-rw-r--r--src/Bindings/ManualBindings_Network.cpp4
-rw-r--r--src/Bindings/ManualBindings_World.cpp4
3 files changed, 9 insertions, 9 deletions
diff --git a/src/Bindings/LuaState.cpp b/src/Bindings/LuaState.cpp
index 3b9d30933..31493d4fe 100644
--- a/src/Bindings/LuaState.cpp
+++ b/src/Bindings/LuaState.cpp
@@ -1213,7 +1213,7 @@ bool cLuaState::GetStackValue(int a_StackPos, cCallbackPtr & a_Callback)
{
if (a_Callback == nullptr)
{
- a_Callback = cpp14::make_unique<cCallback>();
+ a_Callback = std::make_unique<cCallback>();
}
return a_Callback->RefStack(*this, a_StackPos);
}
@@ -1235,7 +1235,7 @@ bool cLuaState::GetStackValue(int a_StackPos, cOptionalCallbackPtr & a_Callback)
{
if (a_Callback == nullptr)
{
- a_Callback = cpp14::make_unique<cOptionalCallback>();
+ a_Callback = std::make_unique<cOptionalCallback>();
}
return a_Callback->RefStack(*this, a_StackPos);
}
@@ -1290,7 +1290,7 @@ bool cLuaState::GetStackValue(int a_StackPos, cStackTablePtr & a_StackTable)
}
// Assign the StackTable to the specified stack position:
- a_StackTable = cpp14::make_unique<cStackTable>(*this, a_StackPos);
+ a_StackTable = std::make_unique<cStackTable>(*this, a_StackPos);
return true;
}
@@ -1311,7 +1311,7 @@ bool cLuaState::GetStackValue(int a_StackPos, cTableRefPtr & a_TableRef)
{
if (a_TableRef == nullptr)
{
- a_TableRef = cpp14::make_unique<cTableRef>();
+ a_TableRef = std::make_unique<cTableRef>();
}
return a_TableRef->RefStack(*this, a_StackPos);
}
@@ -1333,7 +1333,7 @@ bool cLuaState::GetStackValue(int a_StackPos, cTrackedRefPtr & a_Ref)
{
if (a_Ref == nullptr)
{
- a_Ref = cpp14::make_unique<cTrackedRef>();
+ a_Ref = std::make_unique<cTrackedRef>();
}
return a_Ref->RefStack(*this, a_StackPos);
}
diff --git a/src/Bindings/ManualBindings_Network.cpp b/src/Bindings/ManualBindings_Network.cpp
index 4a7dd2367..911e1a8bb 100644
--- a/src/Bindings/ManualBindings_Network.cpp
+++ b/src/Bindings/ManualBindings_Network.cpp
@@ -967,7 +967,7 @@ static int tolua_cUrlClient_Request_Common(lua_State * a_LuaState, const AString
{
return L.ApiParamError("Cannot read the CallbacksTable parameter at idx %d", a_UrlStackIdx + 1);
}
- urlClientCallbacks = cpp14::make_unique<cFullUrlClientCallbacks>(std::move(callbacks));
+ urlClientCallbacks = std::make_unique<cFullUrlClientCallbacks>(std::move(callbacks));
}
else if (lua_isfunction(L, a_UrlStackIdx + 1))
{
@@ -975,7 +975,7 @@ static int tolua_cUrlClient_Request_Common(lua_State * a_LuaState, const AString
{
return L.ApiParamError("Cannot read the CallbackFn parameter at idx %d", a_UrlStackIdx + 1);
}
- urlClientCallbacks = cpp14::make_unique<cSimpleUrlClientCallbacks>(std::move(onCompleteBodyCallback));
+ urlClientCallbacks = std::make_unique<cSimpleUrlClientCallbacks>(std::move(onCompleteBodyCallback));
}
else
{
diff --git a/src/Bindings/ManualBindings_World.cpp b/src/Bindings/ManualBindings_World.cpp
index cfefb4f7a..8c73c5cd1 100644
--- a/src/Bindings/ManualBindings_World.cpp
+++ b/src/Bindings/ManualBindings_World.cpp
@@ -307,7 +307,7 @@ static int tolua_cWorld_ChunkStay(lua_State * tolua_S)
ASSERT(chunkCoords != nullptr); // If the table was invalid, GetStackValues() would have failed
// Read the chunk coords:
- auto chunkStay = cpp14::make_unique<cLuaChunkStay>();
+ auto chunkStay = std::make_unique<cLuaChunkStay>();
if (!chunkStay->AddChunks(*chunkCoords))
{
return 0;
@@ -732,7 +732,7 @@ static int tolua_cWorld_PrepareChunk(lua_State * tolua_S)
cWorld * world = nullptr;
int chunkX = 0;
int chunkZ = 0;
- auto Callback = cpp14::make_unique<cCallback>();
+ auto Callback = std::make_unique<cCallback>();
L.GetStackValues(1, world, chunkX, chunkZ, Callback->m_LuaCallback);
if (world == nullptr)
{