diff options
| author | Léo Lam <leo@innovatetechnologi.es> | 2018-06-15 19:52:06 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-15 19:52:06 +0200 |
| commit | 2b6d6c12bfd17875ac99da58ec14b0fcc3e8e750 (patch) | |
| tree | 63dc25f82fc19b5236219352fe8367e00b46dd55 /Source/Android/jni/MainAndroid.cpp | |
| parent | 58606702f77e0703851b25378ed7c6768c2f2571 (diff) | |
| parent | 6f473b96d0fc8341eadc34c61a2c552c20245975 (diff) | |
Merge pull request #7124 from lioncash/enum-class
PowerPC: Convert CPUCore enum into an enum class
Diffstat (limited to 'Source/Android/jni/MainAndroid.cpp')
| -rw-r--r-- | Source/Android/jni/MainAndroid.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/Android/jni/MainAndroid.cpp b/Source/Android/jni/MainAndroid.cpp index 730175e340..69f76bfe3d 100644 --- a/Source/Android/jni/MainAndroid.cpp +++ b/Source/Android/jni/MainAndroid.cpp @@ -445,7 +445,7 @@ JNIEXPORT jstring JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_GetUserDi JNIEXPORT jint JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_DefaultCPUCore(JNIEnv* env, jobject obj) { - return PowerPC::DefaultCPUCore(); + return static_cast<jint>(PowerPC::DefaultCPUCore()); } JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_SetProfiling(JNIEnv* env, |