diff options
| author | Per Larsson <[email protected]> | 2022-01-11 10:31:34 +0100 |
|---|---|---|
| committer | Per Larsson <[email protected]> | 2022-01-11 10:31:34 +0100 |
| commit | fa40b11e35f9791bd6ca472ef7bfc246eecbd696 (patch) | |
| tree | 058c1dcef54eb3c15eedc12b29f24d72db239d52 /zenserver/config.cpp | |
| parent | Added option to disable Sentry crash handler. (diff) | |
| parent | Not all toolchains support C++20's atomic<double>::fetch_add() (diff) | |
| download | zen-fa40b11e35f9791bd6ca472ef7bfc246eecbd696.tar.xz zen-fa40b11e35f9791bd6ca472ef7bfc246eecbd696.zip | |
Merged main.
Diffstat (limited to 'zenserver/config.cpp')
| -rw-r--r-- | zenserver/config.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/zenserver/config.cpp b/zenserver/config.cpp index f7b2f15fa..eb10420c8 100644 --- a/zenserver/config.cpp +++ b/zenserver/config.cpp @@ -397,8 +397,6 @@ ParseCliOptions(int argc, char* argv[], ZenServerOptions& ServerOptions) void ParseConfigFile(const std::filesystem::path& Path, ZenServerOptions& ServerOptions) { - using namespace fmt::literals; - zen::IoBuffer LuaScript = zen::IoBufferBuilder::MakeFromFile(Path); if (LuaScript) @@ -436,14 +434,14 @@ ParseConfigFile(const std::filesystem::path& Path, ZenServerOptions& ServerOptio std::string ErrorString = sol::to_string(config.status()); - throw std::runtime_error("{} error: {}"_format(ErrorString, err.what())); + throw std::runtime_error(fmt::format("{} error: {}", ErrorString, err.what())); } config(); } catch (std::exception& e) { - throw std::runtime_error("failed to load config script ('{}'): {}"_format(Path, e.what()).c_str()); + throw std::runtime_error(fmt::format("failed to load config script ('{}'): {}", Path, e.what()).c_str()); } if (sol::optional<sol::table> ServerConfig = lua["server"]) |