From 848e0913dfcbd2f28ddf7d8a096f74d1bd6e26b4 Mon Sep 17 00:00:00 2001 From: Merry Date: Sat, 5 Nov 2022 19:24:55 +0000 Subject: [PATCH] decoder_detail: Fix Android NDK compilation issue --- src/dynarmic/frontend/decoder/decoder_detail.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/dynarmic/frontend/decoder/decoder_detail.h b/src/dynarmic/frontend/decoder/decoder_detail.h index a82e1041..cf7d0e64 100644 --- a/src/dynarmic/frontend/decoder/decoder_detail.h +++ b/src/dynarmic/frontend/decoder/decoder_detail.h @@ -107,8 +107,8 @@ struct detail { } } -#ifndef DYNARMIC_IGNORE_ASSERTS - // Avoids a MSVC ICE. +#if !defined(DYNARMIC_IGNORE_ASSERTS) && !defined(__ANDROID__) + // Avoids a MSVC ICE, and avoids Android NDK issue. ASSERT(std::all_of(masks.begin(), masks.end(), [](auto m) { return m != 0; })); #endif