diff options
| author | Matthew Parlane <parlane@gmail.com> | 2016-05-07 20:24:59 +1200 |
|---|---|---|
| committer | Matthew Parlane <parlane@gmail.com> | 2016-05-07 20:24:59 +1200 |
| commit | 1e1fce1a035934b47ef16607c3cbd276c4ecb312 (patch) | |
| tree | 68261ae6493a65cd9bec7d150c7bd5f0cfb0c6b8 /Source/Android/jni/MainAndroid.cpp | |
| parent | 461a48f8e38101e757f18a1d3b8d04c6ddfea336 (diff) | |
| parent | 2030ad45772742e8de34dbc94baa9eb49a0f7335 (diff) | |
Merge pull request #3815 from degasus/scm
SCM: Use std::string.
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 df35f9e63d..d9b8a61fba 100644 --- a/Source/Android/jni/MainAndroid.cpp +++ b/Source/Android/jni/MainAndroid.cpp @@ -475,7 +475,7 @@ JNIEXPORT jint JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_GetPlatform( JNIEXPORT jstring JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_GetVersionString(JNIEnv *env, jobject obj) { - return env->NewStringUTF(scm_rev_str); + return env->NewStringUTF(scm_rev_str.c_str()); } JNIEXPORT jboolean JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_SupportsNEON(JNIEnv *env, jobject obj) |