diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-09-04 20:53:31 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-09-04 20:53:31 +0200 |
| commit | 580084e9e1d0355c96a54a9641df6c1fee894948 (patch) | |
| tree | 5aff416b5aed2ca9e326054567d837f28c20ed25 /mfbt/tests | |
| parent | fc61780b35af913801d72086456f493f63197da6 (diff) | |
| parent | b28ab55f9675f2e97dda9a4fcac0d4f5267a2bb9 (diff) | |
| download | UXP-580084e9e1d0355c96a54a9641df6c1fee894948.tar UXP-580084e9e1d0355c96a54a9641df6c1fee894948.tar.gz UXP-580084e9e1d0355c96a54a9641df6c1fee894948.tar.lz UXP-580084e9e1d0355c96a54a9641df6c1fee894948.tar.xz UXP-580084e9e1d0355c96a54a9641df6c1fee894948.zip | |
Merge branch 'master' into Basilisk-releasev2018.09.05
Diffstat (limited to 'mfbt/tests')
| -rw-r--r-- | mfbt/tests/TestTypeTraits.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mfbt/tests/TestTypeTraits.cpp b/mfbt/tests/TestTypeTraits.cpp index f0a565142..eb412bc54 100644 --- a/mfbt/tests/TestTypeTraits.cpp +++ b/mfbt/tests/TestTypeTraits.cpp @@ -70,8 +70,8 @@ static_assert(!IsPointer<IsPointerTest>::value, "IsPointerTest not a pointer"); static_assert(IsPointer<IsPointerTest*>::value, "IsPointerTest* is a pointer"); -static_assert(!IsPointer<bool(IsPointerTest::*)>::value, - "bool(IsPointerTest::*) not a pointer"); +static_assert(!IsPointer<bool(IsPointerTest::*)()>::value, + "bool(IsPointerTest::*)() not a pointer"); static_assert(!IsPointer<void(IsPointerTest::*)(void)>::value, "void(IsPointerTest::*)(void) not a pointer"); |