Skip to content

Commit e959142

Browse files
committed
[Fix] mpt/base/utility.hpp: And Android Clang is again lying about its version number...
git-svn-id: https://source.openmpt.org/svn/openmpt/trunk/OpenMPT@22970 56274372-70c3-4bfc-bfc3-4c3a0b034d27
1 parent 18c9764 commit e959142

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

src/mpt/base/utility.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,12 @@ MPT_CONSTEXPRINLINE Tdst function_pointer_cast(Tsrc f) {
4646
static_assert(std::is_function<typename std::remove_pointer<typename std::remove_cv<Tsrc>::type>::type>::value);
4747
static_assert(std::is_function<typename std::remove_pointer<typename std::remove_cv<Tdst>::type>::type>::value);
4848
#endif
49-
#if MPT_CLANG_AT_LEAST(19, 0, 0)
49+
#if (MPT_CLANG_AT_LEAST(19, 0, 0) && !MPT_OS_ANDROID) || MPT_CLANG_AT_LEAST(20, 0, 0)
5050
#pragma clang diagnostic push
5151
#pragma clang diagnostic ignored "-Wcast-function-type-mismatch"
5252
#endif
5353
return reinterpret_cast<Tdst>(f);
54-
#if MPT_CLANG_AT_LEAST(19, 0, 0)
54+
#if (MPT_CLANG_AT_LEAST(19, 0, 0) && !MPT_OS_ANDROID) || MPT_CLANG_AT_LEAST(20, 0, 0)
5555
#pragma clang diagnostic pop
5656
#endif
5757
}

0 commit comments

Comments
 (0)