From 2030ad45772742e8de34dbc94baa9eb49a0f7335 Mon Sep 17 00:00:00 2001 From: degasus Date: Wed, 4 May 2016 23:47:23 +0200 Subject: SCM: Use std::string. Those macros may be defined, or not. We should support both cases, so use std::string as it also defines the length of the string. --- Source/Android/jni/MainAndroid.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Source/Android/jni/MainAndroid.cpp') 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) -- cgit v1.2.3