From be07c3fb652efd7b11a6cb58099d2b198b184bf4 Mon Sep 17 00:00:00 2001 From: Ivan Epifanov Date: Mon, 3 May 2021 20:47:31 +0300 Subject: [PATCH] Remove vita hack --- Source/controls/keymapper.cpp | 8 -------- 1 file changed, 8 deletions(-) diff --git a/Source/controls/keymapper.cpp b/Source/controls/keymapper.cpp index 006d9b055..e053dd9f7 100644 --- a/Source/controls/keymapper.cpp +++ b/Source/controls/keymapper.cpp @@ -19,11 +19,7 @@ Keymapper::Keymapper(SetConfigKeyFunction setKeyFunction, GetConfigKeyFunction g , getKeyFunction(getKeyFunction) { // Insert all supported keys: a-z, 0-9 and F1-F12. -#ifndef __vita__ - // HACK: Disable reserving on Vita because it triggers a linking error: - // "multiple definition of `ceill'". keyIDToKeyName.reserve(('Z' - 'A' + 1) + ('9' - '0' + 1) + 12); -#endif for (char c = 'A'; c <= 'Z'; ++c) { keyIDToKeyName.emplace(c, std::string(1, c)); } @@ -34,11 +30,7 @@ Keymapper::Keymapper(SetConfigKeyFunction setKeyFunction, GetConfigKeyFunction g keyIDToKeyName.emplace(DVL_VK_F1 + i, fmt::format("F{}", i + 1)); } -#ifndef __vita__ - // HACK: Disable reserving on Vita because it triggers a linking error: - // "multiple definition of `ceill'". keyNameToKeyID.reserve(keyIDToKeyName.size()); -#endif for (const auto &kv : keyIDToKeyName) { keyNameToKeyID.emplace(kv.second, kv.first); }