ams: std::optional -> util::optional

2021-07-08 02:37:26 -07:00
parent 9df13781c2
commit a7c14e03b9
59 changed files with 950 additions and 147 deletions
--- a/libraries/libstratosphere/source/fssystem/fssystem_crypto_configuration.cpp
+++ b/libraries/libstratosphere/source/fssystem/fssystem_crypto_configuration.cpp
@@ -113,7 +113,7 @@ namespace ams::fssystem {

        constexpr inline s32 KeySlotCacheEntryCount = 3;
        KeySlotCache g_key_slot_cache;
-        std::optional<KeySlotCacheEntry> g_key_slot_cache_entry[KeySlotCacheEntryCount];
+        util::optional<KeySlotCacheEntry> g_key_slot_cache_entry[KeySlotCacheEntryCount];

        spl::AccessKey &GetNcaKekAccessKey(s32 key_type) {
            static spl::AccessKey s_nca_kek_access_key_array[KeyAreaEncryptionKeyCount] = {};