Use structured binding for pair values
dir_path is used by PanicAlertFormatT, which prior to PR 10209 used a lambda. Before c++20, referring to structured bindings in lambda captures was forbidden. The problem is now doubly fixed, so put the structured binding back in.
This commit is contained in:
parent
d48d317cfb
commit
ff26f6435e
|
@ -178,11 +178,7 @@ void CEXIMemoryCard::SetupGciFolder(const Memcard::HeaderData& header_data)
|
||||||
current_game_id = Common::swap32(reinterpret_cast<const u8*>(game_id.c_str()));
|
current_game_id = Common::swap32(reinterpret_cast<const u8*>(game_id.c_str()));
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO(C++20): Use structured bindings when we can use C++20 and refer to structured bindings
|
const auto [dir_path, migrate] = GetGCIFolderPath(m_card_slot, AllowMovieFolder::Yes);
|
||||||
// in lambda captures
|
|
||||||
const auto folder_path_pair = GetGCIFolderPath(m_card_slot, AllowMovieFolder::Yes);
|
|
||||||
const std::string& dir_path = folder_path_pair.first;
|
|
||||||
const bool migrate = folder_path_pair.second;
|
|
||||||
|
|
||||||
const File::FileInfo file_info(dir_path);
|
const File::FileInfo file_info(dir_path);
|
||||||
if (!file_info.Exists())
|
if (!file_info.Exists())
|
||||||
|
|
Loading…
Reference in New Issue