Exverge/suyu
3
0
Fork 0
forked from suyu/suyu
Code Pull requests Activity

ips_layer: Remove unnecessary explicit std::pair constructor in std::array

Browse source 
Makes the layout of the array consistent, by making all elements match,
instead of special-casing the first one.
This commit is contained in:
Lioncash 2018-10-09 13:42:34 -04:00
parent f7d2889fb4
commit 9ff743bc0a
1 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/core/file_sys/ips_layer.cpp
View file

@ -22,11 +22,19 @@ enum class IPSFileType {
Error, Error,
}; };
constexpr std::array<std::pair<const char*, const char*>, 11> ESCAPE_CHARACTER_MAP{ constexpr std::array<std::pair<const char*, const char*>, 11> ESCAPE_CHARACTER_MAP{{
std::pair{"\\a", "\a"}, {"\\b", "\b"}, {"\\f", "\f"}, {"\\n", "\n"}, {"\\a", "\a"},
{"\\r", "\r"}, {"\\t", "\t"}, {"\\v", "\v"}, {"\\\\", "\\"}, {"\\b", "\b"},
{"\\\'", "\'"}, {"\\\"", "\""}, {"\\\?", "\?"}, {"\\f", "\f"},
}; {"\\n", "\n"},
{"\\r", "\r"},
{"\\t", "\t"},
{"\\v", "\v"},
{"\\\\", "\\"},
{"\\\'", "\'"},
{"\\\"", "\""},
{"\\\?", "\?"},
}};
static IPSFileType IdentifyMagic(const std::vector<u8>& magic) { static IPSFileType IdentifyMagic(const std::vector<u8>& magic) {
if (magic.size() != 5) if (magic.size() != 5)