summaryrefslogtreecommitdiffstats
path: root/src/Root.cpp
diff options
context:
space:
mode:
authorMattes D <github@xoft.cz>2020-08-01 20:18:03 +0200
committerTiger Wang <ziwei.tiger@outlook.com>2020-08-01 21:04:31 +0200
commit46398f4671012a0d913bd7bc0c70ffdc2645f2ac (patch)
tree11d766b1ce592e526b6cbac8d7a245208bdce26e /src/Root.cpp
parentAdded HandleCraftItem call to ShiftClickedResult to make sure achievements are awarded (#4791) (diff)
downloadcuberite-46398f4671012a0d913bd7bc0c70ffdc2645f2ac.tar
cuberite-46398f4671012a0d913bd7bc0c70ffdc2645f2ac.tar.gz
cuberite-46398f4671012a0d913bd7bc0c70ffdc2645f2ac.tar.bz2
cuberite-46398f4671012a0d913bd7bc0c70ffdc2645f2ac.tar.lz
cuberite-46398f4671012a0d913bd7bc0c70ffdc2645f2ac.tar.xz
cuberite-46398f4671012a0d913bd7bc0c70ffdc2645f2ac.tar.zst
cuberite-46398f4671012a0d913bd7bc0c70ffdc2645f2ac.zip
Diffstat (limited to '')
-rw-r--r--src/Root.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Root.cpp b/src/Root.cpp
index 8b8df817d..4b40fd983 100644
--- a/src/Root.cpp
+++ b/src/Root.cpp
@@ -177,7 +177,7 @@ void cRoot::Start(std::unique_ptr<cSettingsRepositoryInterface> a_OverridesRepo)
m_SettingsFilename = a_OverridesRepo->GetValue("Server","ConfigFile");
}
- auto IniFile = cpp14::make_unique<cIniFile>();
+ auto IniFile = std::make_unique<cIniFile>();
bool IsNewIniFile = !IniFile->ReadFile(m_SettingsFilename);
if (IsNewIniFile)
@@ -187,7 +187,7 @@ void cRoot::Start(std::unique_ptr<cSettingsRepositoryInterface> a_OverridesRepo)
IniFile->AddHeaderComment(" Most of the settings here can be configured using the webadmin interface, if enabled in webadmin.ini");
}
- auto settingsRepo = cpp14::make_unique<cOverridesSettingsRepository>(std::move(IniFile), std::move(a_OverridesRepo));
+ auto settingsRepo = std::make_unique<cOverridesSettingsRepository>(std::move(IniFile), std::move(a_OverridesRepo));
LOG("Starting server...");