Merge pull request #941 from Scrumplex/bump-cxx-standard

Bump to C++17
2022-07-30 17:10:59 +01:00
parent d6d7794cd0
commit dc32f0671b
16 changed files with 33 additions and 612 deletions
--- a/launcher/minecraft/World.cpp
+++ b/launcher/minecraft/World.cpp
@ -53,12 +53,12 @@

 #include <QCoreApplication>

-#include <nonstd/optional>
+#include <optional>

-using nonstd::optional;
-using nonstd::nullopt;
+using std::optional;
+using std::nullopt;

-GameType::GameType(nonstd::optional<int> original):
+GameType::GameType(std::optional<int> original):
    original(original)
 {
    if(!original) {