dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix use of optional from wrong namespace

Browse Source
This commit is contained in:
Jonathan G Rennison
2021-11-03 01:33:31 +00:00
parent 168dc4678d
commit 486e69f1f8
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/fios.cpp
View File

@@ -753,7 +753,7 @@ void ScanScenarios()
*/ */
FiosNumberedSaveName::FiosNumberedSaveName(const std::string &prefix) : prefix(prefix), number(-1) FiosNumberedSaveName::FiosNumberedSaveName(const std::string &prefix) : prefix(prefix), number(-1)
{ {
static std::optional<std::string> _autosave_path; static opt::optional<std::string> _autosave_path;
if (!_autosave_path) _autosave_path = FioFindDirectory(AUTOSAVE_DIR); if (!_autosave_path) _autosave_path = FioFindDirectory(AUTOSAVE_DIR);
static std::string _prefix; ///< Static as the lambda needs access to it. static std::string _prefix; ///< Static as the lambda needs access to it.

2
src/saveload/upstream/saveload.h
View File

@@ -88,7 +88,7 @@ using SaveLoadCompatTable = span<const struct SaveLoadCompat>;
/** Handler for saving/loading an object to/from disk. */ /** Handler for saving/loading an object to/from disk. */
class SaveLoadHandler { class SaveLoadHandler {
public: public:
std::optional<std::vector<SaveLoad>> load_description; opt::optional<std::vector<SaveLoad>> load_description;
virtual ~SaveLoadHandler() {} virtual ~SaveLoadHandler() {}