diff options
| author | LennyMcLennington <lenny@sneed.church> | 2022-07-30 17:10:59 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-30 17:10:59 +0100 |
| commit | 94a63e3859e576658d832c62cffacbb6963ad1e6 (patch) | |
| tree | cb6efc767b734de22675cdba1fed4b9728de509e /launcher/minecraft | |
| parent | 74120fe1f3b072b78298dce68aedb397efb522a2 (diff) | |
| parent | 842b7e6c3974c16adddf3cccda4e0008d8c64597 (diff) | |
| download | PrismLauncher-94a63e3859e576658d832c62cffacbb6963ad1e6.tar.gz PrismLauncher-94a63e3859e576658d832c62cffacbb6963ad1e6.tar.bz2 PrismLauncher-94a63e3859e576658d832c62cffacbb6963ad1e6.zip | |
Merge pull request #941 from Scrumplex/bump-cxx-standard
Bump to C++17
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 |