Add missing includes and use const where applicable

This commit is contained in:
Zach Hilman 2018-07-29 19:00:09 -04:00
parent 150527ec19
commit 03149d3e4a
11 changed files with 40 additions and 24 deletions

View file

@ -5,6 +5,7 @@
#pragma once
#include <array>
#include <type_traits>
#include <unordered_map>
#include <vector>
#include <fmt/format.h>
@ -50,7 +51,7 @@ struct KeyIndex {
std::string DebugInfo() const {
u8 key_size = 16;
if (std::is_same_v<KeyType, S256KeyType>)
if constexpr (std::is_same_v<KeyType, S256KeyType>)
key_size = 32;
return fmt::format("key_size={:02X}, key={:02X}, field1={:016X}, field2={:016X}", key_size,
static_cast<u8>(type), field1, field2);
@ -110,7 +111,7 @@ private:
void AttemptLoadKeyFile(std::string_view dir1, std::string_view dir2, std::string_view filename,
bool title);
static std::unordered_map<std::string, KeyIndex<S128KeyType>> s128_file_id;
static std::unordered_map<std::string, KeyIndex<S256KeyType>> s256_file_id;
const static std::unordered_map<std::string, KeyIndex<S128KeyType>> s128_file_id;
const static std::unordered_map<std::string, KeyIndex<S256KeyType>> s256_file_id;
};
} // namespace Core::Crypto