From 4cc163ea1cb676cc6a7a391d8fbfdb60e1566cf1 Mon Sep 17 00:00:00 2001 From: Lion Kortlepel Date: Sun, 13 Nov 2022 00:25:06 +0100 Subject: [PATCH] switch to c++20 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 ;) --- CMakeLists.txt | 2 +- src/ArgsParser.cpp | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7f75997..c7814d5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -99,7 +99,7 @@ endif() add_subdirectory("deps/sentry-native") # ------------------------ C++ SETUP --------------------------------- -set(CMAKE_CXX_STANDARD 17) +set(CMAKE_CXX_STANDARD 20) # ------------------------ DEPENDENCIES ------------------------------ message(STATUS "Adding local source dependencies") diff --git a/src/ArgsParser.cpp b/src/ArgsParser.cpp index c5e19d7..55e85ae 100644 --- a/src/ArgsParser.cpp +++ b/src/ArgsParser.cpp @@ -28,11 +28,11 @@ bool ArgsParser::Verify() { } else if (FoundArgument(RegisteredArg.Names)) { if (RegisteredArg.Flags & Flags::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; } } 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; } } @@ -81,7 +81,7 @@ void ArgsParser::ConsumeLongAssignment(const std::string& Arg) { auto Value = Arg.substr(Arg.rfind("=") + 1); auto Name = Arg.substr(2, Arg.rfind("=") - 2); 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 }); } @@ -90,7 +90,7 @@ void ArgsParser::ConsumeLongFlag(const std::string& Arg) { auto Name = Arg.substr(2, Arg.rfind("=") - 2); mFoundArgs.push_back({ Name, std::nullopt }); 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); } }