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

switch to c++20

Browse Source 
this will allow us to use more convenience features of the language, and
leave more legacy code behind - also we can use c++20 libraries ;)
This commit is contained in:
Lion Kortlepel
2022-11-13 00:25:06 +01:00
parent 01bcc3d18c
commit 4cc163ea1c
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@@ -99,7 +99,7 @@ endif()
add_subdirectory("deps/sentry-native") add_subdirectory("deps/sentry-native")
# ------------------------ C++ SETUP --------------------------------- # ------------------------ C++ SETUP ---------------------------------
set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD 20)
# ------------------------ DEPENDENCIES ------------------------------ # ------------------------ DEPENDENCIES ------------------------------
message(STATUS "Adding local source dependencies") message(STATUS "Adding local source dependencies")

8
src/ArgsParser.cpp
View File

@@ -28,11 +28,11 @@ bool ArgsParser::Verify() {
} else if (FoundArgument(RegisteredArg.Names)) { } else if (FoundArgument(RegisteredArg.Names)) {
if (RegisteredArg.Flags & Flags::HAS_VALUE) { if (RegisteredArg.Flags & Flags::HAS_VALUE) {
if (!GetValueOfArgument(RegisteredArg.Names).has_value()) { if (!GetValueOfArgument(RegisteredArg.Names).has_value()) {
fmt::print(stderr, "Error in commandline arguments: Argument '" + std::string(RegisteredArg.Names.at(0)) + "' expects a value, but no value was given."); fmt::print(stderr, "Error in commandline arguments: Argument '{}' expects a value, but no value was given.", RegisteredArg.Names.at(0));
Ok = false; Ok = false;
} }
} else if (GetValueOfArgument(RegisteredArg.Names).has_value()) { } else if (GetValueOfArgument(RegisteredArg.Names).has_value()) {
fmt::print(stderr, "Error in commandline arguments: Argument '" + std::string(RegisteredArg.Names.at(0)) + "' does not expect a value, but one was given."); fmt::print(stderr, "Error in commandline arguments: Argument '{}' does not expect a value, but one was given.", RegisteredArg.Names.at(0));
Ok = false; Ok = false;
} }
} }
@@ -81,7 +81,7 @@ void ArgsParser::ConsumeLongAssignment(const std::string& Arg) {
auto Value = Arg.substr(Arg.rfind("=") + 1); auto Value = Arg.substr(Arg.rfind("=") + 1);
auto Name = Arg.substr(2, Arg.rfind("=") - 2); auto Name = Arg.substr(2, Arg.rfind("=") - 2);
if (!IsRegistered(Name)) { if (!IsRegistered(Name)) {
fmt::print(stdout, "Argument '" + Name + "' was supplied but isn't a known argument, so it is likely being ignored."); fmt::print(stdout, "Argument '{}' was supplied but isn't a known argument, so it is likely being ignored.", Name);
} }
mFoundArgs.push_back({ Name, Value }); mFoundArgs.push_back({ Name, Value });
} }
@@ -90,7 +90,7 @@ void ArgsParser::ConsumeLongFlag(const std::string& Arg) {
auto Name = Arg.substr(2, Arg.rfind("=") - 2); auto Name = Arg.substr(2, Arg.rfind("=") - 2);
mFoundArgs.push_back({ Name, std::nullopt }); mFoundArgs.push_back({ Name, std::nullopt });
if (!IsRegistered(Name)) { if (!IsRegistered(Name)) {
fmt::print(stdout, "Argument '" + Name + "' was supplied but isn't a known argument, so it is likely being ignored."); fmt::print(stdout, "Argument '{}' was supplied but isn't a known argument, so it is likely being ignored.", Name);
} }
} }