diff options
author | Mattes D <github@xoft.cz> | 2020-08-01 20:18:03 +0200 |
---|---|---|
committer | Tiger Wang <ziwei.tiger@outlook.com> | 2020-08-01 21:04:31 +0200 |
commit | 46398f4671012a0d913bd7bc0c70ffdc2645f2ac (patch) | |
tree | 11d766b1ce592e526b6cbac8d7a245208bdce26e /src/main.cpp | |
parent | Added HandleCraftItem call to ShiftClickedResult to make sure achievements are awarded (#4791) (diff) | |
download | cuberite-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/main.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/main.cpp b/src/main.cpp index 7411b410e..4d59fea0e 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -256,7 +256,7 @@ static DWORD WINAPI serviceWorkerThread(LPVOID lpParam) while (!cRoot::m_TerminateEventRaised) { // Do the normal startup - UniversalMain(cpp14::make_unique<cMemorySettingsRepository>()); + UniversalMain(std::make_unique<cMemorySettingsRepository>()); } return ERROR_SUCCESS; @@ -380,7 +380,7 @@ static std::unique_ptr<cMemorySettingsRepository> ParseArguments(int argc, char cmd.parse(argc, argv); // Copy the parsed args' values into a settings repository: - auto repo = cpp14::make_unique<cMemorySettingsRepository>(); + auto repo = std::make_unique<cMemorySettingsRepository>(); if (confArg.isSet()) { AString conf_file = confArg.getValue(); @@ -441,7 +441,7 @@ static std::unique_ptr<cMemorySettingsRepository> ParseArguments(int argc, char catch (const TCLAP::ArgException & exc) { fmt::print("Error reading command line {0} for arg {1}", exc.error(), exc.argId()); - return cpp14::make_unique<cMemorySettingsRepository>(); + return std::make_unique<cMemorySettingsRepository>(); } } |