ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Core: Fix invalid lambda captures 

PR #9260 made the MsgAlert macros use lambdas so that local
constexpr variables can be added while keeping the ability to
return a boolean from the macros.

Unfortunately, C++17 forbids referring to structured bindings in lambda
captures. This is fixed in P1091R3 but we cannot rely on C++20 yet...
This commit is contained in:
Léo Lam 2020-11-20 18:25:02 +01:00
parent f45a4a5916
commit 542c49bab0
No known key found for this signature in database
GPG Key ID: 0DF30F9081000741
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Core/Core/HW/EXI/EXI_DeviceMemoryCard.cpp
View File

@ -185,7 +185,11 @@ void CEXIMemoryCard::SetupGciFolder(const Memcard::HeaderData& header_data)
CurrentGameId = Common::swap32(reinterpret_cast<const u8*>(game_id.c_str()));
}
const auto [strDirectoryName, migrate] = GetGCIFolderPath(card_index, AllowMovieFolder::Yes);
// TODO(C++20): Use structured bindings when we can use C++20 and refer to structured bindings
// in lambda captures
const auto folder_path = GetGCIFolderPath(card_index, AllowMovieFolder::Yes);
const auto& strDirectoryName = folder_path.first;
const bool migrate = folder_path.second;
const File::FileInfo file_info(strDirectoryName);
if (!file_info.Exists())