From fceb98a3107b7a7cef9ce019c7d4c3f4f9482e72 Mon Sep 17 00:00:00 2001 From: SachinVin Date: Sat, 10 Apr 2021 18:02:10 +0530 Subject: [PATCH] Android: native.cpp: use switch to map LoadCallbackStages --- src/android/app/src/main/jni/native.cpp | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/src/android/app/src/main/jni/native.cpp b/src/android/app/src/main/jni/native.cpp index 6238d30f4..3aaad3558 100644 --- a/src/android/app/src/main/jni/native.cpp +++ b/src/android/app/src/main/jni/native.cpp @@ -120,14 +120,23 @@ static bool HandleCoreError(Core::System::ResultStatus result, const std::string } static jobject ToJavaLoadCallbackStage(VideoCore::LoadCallbackStage stage) { - static const std::map LoadCallbackStageMap{ - {VideoCore::LoadCallbackStage::Prepare, "Prepare"}, - {VideoCore::LoadCallbackStage::Decompile, "Decompile"}, - {VideoCore::LoadCallbackStage::Build, "Build"}, - {VideoCore::LoadCallbackStage::Complete, "Complete"}, - }; - - const auto name = LoadCallbackStageMap.at(stage); + const char* name; + switch (stage) { + case VideoCore::LoadCallbackStage::Prepare: + name = "Prepare"; + break; + case VideoCore::LoadCallbackStage::Decompile: + name = "Decompile"; + break; + case VideoCore::LoadCallbackStage::Build: + name = "Build"; + break; + case VideoCore::LoadCallbackStage::Complete: + name = "Complete"; + break; + default: + UNREACHABLE(); + } JNIEnv* env = IDCache::GetEnvForThread();