diff options
| author | Sefa Eyeoglu <contact@scrumplex.net> | 2022-07-20 14:21:44 +0200 |
|---|---|---|
| committer | Sefa Eyeoglu <contact@scrumplex.net> | 2022-07-20 14:22:10 +0200 |
| commit | c666c3e2513c47552e91142925b2edabf1fd04ee (patch) | |
| tree | df145c01e1c138a18292c9c5b08634636d6c524c /launcher/minecraft | |
| parent | e78c7af7158846decae06959d6b4ffe327438ee9 (diff) | |
| download | PrismLauncher-c666c3e2513c47552e91142925b2edabf1fd04ee.tar.gz PrismLauncher-c666c3e2513c47552e91142925b2edabf1fd04ee.tar.bz2 PrismLauncher-c666c3e2513c47552e91142925b2edabf1fd04ee.zip | |
refactor!: bump to C++17 and C17
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
Diffstat (limited to 'launcher/minecraft')
| -rw-r--r-- | launcher/minecraft/World.cpp | 8 | ||||
| -rw-r--r-- | launcher/minecraft/World.h | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/launcher/minecraft/World.cpp b/launcher/minecraft/World.cpp index dfcb43d8..90fcf337 100644 --- 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) { diff --git a/launcher/minecraft/World.h b/launcher/minecraft/World.h index 0f587620..8327253a 100644 --- a/launcher/minecraft/World.h +++ b/launcher/minecraft/World.h @@ -16,11 +16,11 @@ #pragma once #include <QFileInfo> #include <QDateTime> -#include <nonstd/optional> +#include <optional> struct GameType { GameType() = default; - GameType (nonstd::optional<int> original); + GameType (std::optional<int> original); QString toTranslatedString() const; QString toLogString() const; @@ -33,7 +33,7 @@ struct GameType { Adventure, Spectator } type = Unknown; - nonstd::optional<int> original; + std::optional<int> original; }; class World |