From eb11fae6d08f479c0799db45860a98af528fa6e7 Mon Sep 17 00:00:00 2001 From: Dimitry Andric Date: Sat, 28 Jul 2018 10:51:19 +0000 Subject: Vendor import of llvm trunk r338150: https://llvm.org/svn/llvm-project/llvm/trunk@338150 --- unittests/Support/ErrorOrTest.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'unittests/Support/ErrorOrTest.cpp') diff --git a/unittests/Support/ErrorOrTest.cpp b/unittests/Support/ErrorOrTest.cpp index 87dcab7b181ec..2ffc6e5b7940a 100644 --- a/unittests/Support/ErrorOrTest.cpp +++ b/unittests/Support/ErrorOrTest.cpp @@ -128,13 +128,13 @@ static_assert( // ErrorOr x(nullptr); // ErrorOr> y; // y = x; // invalid conversion -static_assert(!std::is_assignable>, +static_assert(!std::is_assignable>&, const ErrorOr &>::value, "do not invoke explicit ctors in assignment"); // ErrorOr> x; // x = ErrorOr(nullptr); // invalid conversion -static_assert(!std::is_assignable>, +static_assert(!std::is_assignable>&, ErrorOr &&>::value, "do not invoke explicit ctors in assignment"); } // end anon namespace -- cgit v1.2.3