summaryrefslogtreecommitdiffstats
path: root/src/Root.cpp
diff options
context:
space:
mode:
authortycho <work.tycho@gmail.com>2015-05-15 14:57:27 +0200
committertycho <work.tycho@gmail.com>2015-05-16 11:47:04 +0200
commitc96849f431bb4152a4258d2480bef8cd272e0c6e (patch)
tree0ca69086678f31818311cd9f9a3f00a094a425d9 /src/Root.cpp
parentInitial implementation of IniFile overloading (diff)
downloadcuberite-c96849f431bb4152a4258d2480bef8cd272e0c6e.tar
cuberite-c96849f431bb4152a4258d2480bef8cd272e0c6e.tar.gz
cuberite-c96849f431bb4152a4258d2480bef8cd272e0c6e.tar.bz2
cuberite-c96849f431bb4152a4258d2480bef8cd272e0c6e.tar.lz
cuberite-c96849f431bb4152a4258d2480bef8cd272e0c6e.tar.xz
cuberite-c96849f431bb4152a4258d2480bef8cd272e0c6e.tar.zst
cuberite-c96849f431bb4152a4258d2480bef8cd272e0c6e.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 de53e0cd8..c3c880e73 100644
--- a/src/Root.cpp
+++ b/src/Root.cpp
@@ -133,7 +133,7 @@ void cRoot::Start(std::unique_ptr<cSettingsRepositoryInterface> overridesRepo)
LOG("Reading server config...");
- auto IniFile = make_unique<cIniFile>();
+ auto IniFile = cpp14::make_unique<cIniFile>();
if (!IniFile->ReadFile("settings.ini"))
{
LOGWARN("Regenerating settings.ini, all settings will be reset");
@@ -141,7 +141,7 @@ void cRoot::Start(std::unique_ptr<cSettingsRepositoryInterface> overridesRepo)
IniFile->AddHeaderComment(" Most of the settings here can be configured using the webadmin interface, if enabled in webadmin.ini");
IniFile->AddHeaderComment(" See: http://wiki.mc-server.org/doku.php?id=configure:settings.ini for further configuration help");
}
- auto settingsRepo = make_unique<cOverridesSettingsRepository>(std::move(IniFile), std::move(overridesRepo));
+ auto settingsRepo = cpp14::make_unique<cOverridesSettingsRepository>(std::move(IniFile), std::move(overridesRepo));
LOG("Starting server...");
m_MojangAPI = new cMojangAPI;