CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Bump to C++17
This commit is contained in:
LennyMcLennington
2022-07-30 17:10:59 +01:00
committed by GitHub
parent 74120fe1f3 842b7e6c39
commit 94a63e3859
16 changed files with 33 additions and 612 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
launcher/minecraft/World.cpp
View File

@ -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) {

6
launcher/minecraft/World.h
View File

@ -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