diff options
| author | Léo Lam <leo@leolam.fr> | 2022-01-30 18:55:36 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-30 18:55:36 +0100 |
| commit | b32af33f24d13b58b28680e02f85baabdcd3499c (patch) | |
| tree | d53140148ffe5d571eda9e13013f6994cb22ef92 /Source | |
| parent | a4122237ebecb92f47f628cd56d6d564ea137034 (diff) | |
| parent | b8a6fcb1a727094ed590aab772e4bfb1929d46f0 (diff) | |
Merge pull request #10409 from JosJuice/android-no-cplusplus-checks
Android: Get rid of __cplusplus macro checks
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/Android/jni/GameList/GameFile.cpp | 5 | ||||
| -rw-r--r-- | Source/Android/jni/GameList/GameFileCache.cpp | 10 |
2 files changed, 0 insertions, 15 deletions
diff --git a/Source/Android/jni/GameList/GameFile.cpp b/Source/Android/jni/GameList/GameFile.cpp index e62052966d..3bf60beb28 100644 --- a/Source/Android/jni/GameList/GameFile.cpp +++ b/Source/Android/jni/GameList/GameFile.cpp @@ -36,9 +36,7 @@ jobject GameFileToJava(JNIEnv* env, std::shared_ptr<const UICommon::GameFile> ga reinterpret_cast<jlong>(new std::shared_ptr<const UICommon::GameFile>(std::move(game_file)))); } -#ifdef __cplusplus extern "C" { -#endif JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_model_GameFile_finalize(JNIEnv* env, jobject obj) @@ -201,7 +199,4 @@ JNIEXPORT jobject JNICALL Java_org_dolphinemu_dolphinemu_model_GameFile_parse(JN return GameFileToJava(env, game_file); } - -#ifdef __cplusplus } -#endif diff --git a/Source/Android/jni/GameList/GameFileCache.cpp b/Source/Android/jni/GameList/GameFileCache.cpp index b79d85db15..061056cc90 100644 --- a/Source/Android/jni/GameList/GameFileCache.cpp +++ b/Source/Android/jni/GameList/GameFileCache.cpp @@ -11,20 +11,13 @@ #include "jni/AndroidCommon/IDCache.h" #include "jni/GameList/GameFile.h" -namespace UICommon -{ -class GameFile; -} - static UICommon::GameFileCache* GetPointer(JNIEnv* env, jobject obj) { return reinterpret_cast<UICommon::GameFileCache*>( env->GetLongField(obj, IDCache::GetGameFileCachePointer())); } -#ifdef __cplusplus extern "C" { -#endif JNIEXPORT jlong JNICALL Java_org_dolphinemu_dolphinemu_model_GameFileCache_newGameFileCache(JNIEnv* env, jclass) @@ -96,7 +89,4 @@ JNIEXPORT jboolean JNICALL Java_org_dolphinemu_dolphinemu_model_GameFileCache_sa { return GetPointer(env, obj)->Save(); } - -#ifdef __cplusplus } -#endif |