BeamMP/BeamMP-Server
1
0
Fork 0
mirror of https://github.com/BeamMP/BeamMP-Server.git synced 2026-04-08 08:46:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

switch boost variant for std::variant for settings, for sol2

Browse Source
This commit is contained in:
Lion Kortlepel
2022-11-13 00:29:52 +01:00
parent dd36299436
commit 152393f8bf
3 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/Common.h
View File

@@ -28,6 +28,7 @@ namespace fs = std::filesystem;
#include <boost/variant.hpp>
#include <chrono>
#include <variant>
using TimeType = std::chrono::system_clock;
@@ -84,7 +85,7 @@ class Application final {
public:
// types
using SettingValue = variant<std::string, bool, int>;
using SettingValue = std::variant<std::string, bool, int>;
using SettingsMap = flat_map<std::string_view, SettingValue>;
static SettingsMap mSettings;

16
src/Common.cpp
View File

@@ -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<std::string>(Value));
return fmt::format("{}", std::get<std::string>(Value));
case 1:
return fmt::format("{}", boost::get<bool>(Value));
return fmt::format("{}", std::get<bool>(Value));
case 2:
return fmt::format("{}", boost::get<int>(Value));
return fmt::format("{}", std::get<int>(Value));
default:
return "<unknown type>";
}
@@ -55,7 +55,7 @@ std::string Application::SettingToString(const Application::SettingValue& Value)
std::string Application::GetSettingString(std::string_view Name) {
try {
return boost::get<std::string>(Application::mSettings.at(Name));
return std::get<std::string>(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<int>(Application::mSettings.at(Name));
return std::get<int>(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<bool>(Application::mSettings.at(Name));
return std::get<bool>(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);

2
src/TConfig.cpp
View File

@@ -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<std::string>(v).size());
beammp_debugf("AuthKey: length {}", std::get<std::string>(v).size());
continue;
}
beammp_debugf("{}: {}", k, Application::SettingToString(v));