diff options
Diffstat (limited to 'mfbt/tests')
| -rw-r--r-- | mfbt/tests/TestTypeTraits.cpp | 14 | ||||
| -rw-r--r-- | mfbt/tests/TestTypedEnum.cpp | 3 |
2 files changed, 1 insertions, 16 deletions
diff --git a/mfbt/tests/TestTypeTraits.cpp b/mfbt/tests/TestTypeTraits.cpp index eb412bc54..cd42f1e44 100644 --- a/mfbt/tests/TestTypeTraits.cpp +++ b/mfbt/tests/TestTypeTraits.cpp @@ -636,20 +636,6 @@ static_assert(IsSame<Decay<int[1]>::Type, int*>::value, static_assert(IsSame<Decay<void(int)>::Type, void(*)(int)>::value, "decaying void(int) must return void(*)(int)"); -/* - * Android's broken [u]intptr_t inttype macros are broken because its PRI*PTR - * macros are defined as "ld", but sizeof(long) is 8 and sizeof(intptr_t) - * is 4 on 32-bit Android. We redefine Android's PRI*PTR macros in - * IntegerPrintfMacros.h and assert here that our new definitions match the - * actual type sizes seen at compile time. - */ -#if defined(ANDROID) && !defined(__LP64__) -static_assert(mozilla::IsSame<int, intptr_t>::value, - "emulated PRI[di]PTR definitions will be wrong"); -static_assert(mozilla::IsSame<unsigned int, uintptr_t>::value, - "emulated PRI[ouxX]PTR definitions will be wrong"); -#endif - int main() { diff --git a/mfbt/tests/TestTypedEnum.cpp b/mfbt/tests/TestTypedEnum.cpp index 43c36f2b8..1c8db754b 100644 --- a/mfbt/tests/TestTypedEnum.cpp +++ b/mfbt/tests/TestTypedEnum.cpp @@ -12,8 +12,7 @@ // A rough feature check for is_literal_type. Not very carefully checked. // Feel free to amend as needed. -// We leave ANDROID out because it's using stlport which doesn't have std::is_literal_type. -#if __cplusplus >= 201103L && !defined(ANDROID) +#if __cplusplus >= 201103L # if defined(__clang__) /* * Per Clang documentation, "Note that marketing version numbers should not |