diff options
| author | Matt Peters <[email protected]> | 2022-01-10 10:57:59 -0700 |
|---|---|---|
| committer | Matt Peters <[email protected]> | 2022-01-10 10:57:59 -0700 |
| commit | 4a12683b27adb31bde9eb8f7df3b9e9cc8ec680a (patch) | |
| tree | c8b2939d400dd4bccae73d2782b15c65d30db19d /zenserver/config.cpp | |
| parent | Add WaitForQuiescence RPC (diff) | |
| parent | Two missing override keywords (diff) | |
| download | zen-wait_for_quiescence.tar.xz zen-wait_for_quiescence.zip | |
Merge branch 'main' into wait_for_quiescencewait_for_quiescence
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 722bc3b97..9fd4bfa69 100644 --- a/zenserver/config.cpp +++ b/zenserver/config.cpp @@ -394,8 +394,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) @@ -433,14 +431,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"]) |