diff --git a/include/Common.h b/include/Common.h index 553f727..4a932d8 100644 --- a/include/Common.h +++ b/include/Common.h @@ -28,6 +28,7 @@ namespace fs = std::filesystem; #include #include +#include using TimeType = std::chrono::system_clock; @@ -84,7 +85,7 @@ class Application final { public: // types - using SettingValue = variant; + using SettingValue = std::variant; using SettingsMap = flat_map; static SettingsMap mSettings; diff --git a/src/Common.cpp b/src/Common.cpp index 6737f2e..6fc1ba1 100644 --- a/src/Common.cpp +++ b/src/Common.cpp @@ -41,13 +41,13 @@ Application::SettingsMap Application::mSettings = { TSentry Sentry {}; std::string Application::SettingToString(const Application::SettingValue& Value) { - switch (Value.which()) { + switch (Value.index()) { case 0: - return fmt::format("{}", boost::get(Value)); + return fmt::format("{}", std::get(Value)); case 1: - return fmt::format("{}", boost::get(Value)); + return fmt::format("{}", std::get(Value)); case 2: - return fmt::format("{}", boost::get(Value)); + return fmt::format("{}", std::get(Value)); default: return ""; } @@ -55,7 +55,7 @@ std::string Application::SettingToString(const Application::SettingValue& Value) std::string Application::GetSettingString(std::string_view Name) { try { - return boost::get(Application::mSettings.at(Name)); + return std::get(Application::mSettings.at(Name)); } catch (const std::exception& e) { beammp_errorf("Failed to get string setting '{}': {}", Name, e.what()); return ""; @@ -64,7 +64,7 @@ std::string Application::GetSettingString(std::string_view Name) { int Application::GetSettingInt(std::string_view Name) { try { - return boost::get(Application::mSettings.at(Name)); + return std::get(Application::mSettings.at(Name)); } catch (const std::exception& e) { beammp_errorf("Failed to get int setting '{}': {}", Name, e.what()); return 0; @@ -73,7 +73,7 @@ int Application::GetSettingInt(std::string_view Name) { bool Application::GetSettingBool(std::string_view Name) { try { - return boost::get(Application::mSettings.at(Name)); + return std::get(Application::mSettings.at(Name)); } catch (const std::exception& e) { beammp_errorf("Failed to get bool setting '{}': {}", Name, e.what()); return false; @@ -82,7 +82,7 @@ bool Application::GetSettingBool(std::string_view Name) { void Application::SetSetting(std::string_view Name, const Application::SettingValue& Value) { if (mSettings.contains(Name)) { - if (mSettings[Name].type() == Value.type()) { + if (mSettings[Name].index() == Value.index()) { mSettings[Name] = Value; } else { beammp_errorf("Could not change value of setting '{}', because it has a different type.", Name); diff --git a/src/TConfig.cpp b/src/TConfig.cpp index 99f8db6..420fd28 100644 --- a/src/TConfig.cpp +++ b/src/TConfig.cpp @@ -191,7 +191,7 @@ void TConfig::ParseFromFile(std::string_view name) { void TConfig::PrintDebug() { for (const auto& [k, v] : Application::mSettings) { if (k == StrAuthKey) { - beammp_debugf("AuthKey: length {}", boost::get(v).size()); + beammp_debugf("AuthKey: length {}", std::get(v).size()); continue; } beammp_debugf("{}: {}", k, Application::SettingToString(v));