From 19244b67bc1602d02f71a56db4afc0cfbe2a9273 Mon Sep 17 00:00:00 2001 From: Eric Fiselier Date: Sun, 24 Jul 2016 23:08:21 +0000 Subject: [PATCH] Guard libc++ specific tests SFINAE on std::bind's call operator. Patch from STL@microsoft.com llvm-svn: 276576 --- .../func.bind/func.bind.bind/bind_return_type.pass.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/libcxx/test/std/utilities/function.objects/bind/func.bind/func.bind.bind/bind_return_type.pass.cpp b/libcxx/test/std/utilities/function.objects/bind/func.bind/func.bind.bind/bind_return_type.pass.cpp index 63d3c9b0de92..a543fffedbb5 100644 --- a/libcxx/test/std/utilities/function.objects/bind/func.bind/func.bind.bind/bind_return_type.pass.cpp +++ b/libcxx/test/std/utilities/function.objects/bind/func.bind/func.bind.bind/bind_return_type.pass.cpp @@ -24,6 +24,8 @@ #include #include +#include "test_macros.h" + int dummy = 42; int return_value(int) { return dummy; } @@ -81,10 +83,10 @@ void do_test(Fn* func) { // Check that the call operator SFINAE's away when too few arguments // are provided but is well-formed otherwise. { - static_assert(!CheckCall(), ""); + LIBCPP_STATIC_ASSERT(!CheckCall(), ""); static_assert(CheckCall(), ""); static_assert(CheckCall(), ""); - static_assert(!CheckCall(), ""); + LIBCPP_STATIC_ASSERT(!CheckCall(), ""); static_assert(CheckCall(), ""); static_assert(CheckCall(), ""); } @@ -108,7 +110,7 @@ void do_test_r(Fn* func) { // Check that the call operator SFINAE's away when too few arguments // are provided but is well-formed otherwise. { - static_assert(!CheckCall(), ""); + LIBCPP_STATIC_ASSERT(!CheckCall(), ""); static_assert(CheckCall(), ""); static_assert(CheckCall(), ""); }