[libcxx-commits] [libcxx] r357092 - Fix occurrences of _LIBCPP_ASSERT in span tests

[Casey Carter via libcxx-commits]

Author: caseycarter
Date: Wed Mar 27 10:03:44 2019
New Revision: 357092

URL: http://llvm.org/viewvc/llvm-project?rev=357092&view=rev
Log:
Fix occurrences of _LIBCPP_ASSERT in span tests

Modified:
    libcxx/trunk/test/std/containers/views/span.elem/back.pass.cpp
    libcxx/trunk/test/std/containers/views/span.elem/front.pass.cpp
    libcxx/trunk/test/std/containers/views/span.elem/op_idx.pass.cpp

Modified: libcxx/trunk/test/std/containers/views/span.elem/back.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/views/span.elem/back.pass.cpp?rev=357092&r1=357091&r2=357092&view=diff
==============================================================================
--- libcxx/trunk/test/std/containers/views/span.elem/back.pass.cpp (original)
+++ libcxx/trunk/test/std/containers/views/span.elem/back.pass.cpp Wed Mar 27 10:03:44 2019
@@ -26,7 +26,7 @@
 template <typename Span>
 constexpr bool testConstexprSpan(Span sp)
 {
-    _LIBCPP_ASSERT(sp.back(), "");
+    LIBCPP_ASSERT(noexcept(sp.back()));
     return std::addressof(sp.back()) == sp.data() + sp.size() - 1;
 }
 
@@ -34,7 +34,7 @@ constexpr bool testConstexprSpan(Span sp
 template <typename Span>
 void testRuntimeSpan(Span sp)
 {
-    _LIBCPP_ASSERT(sp.back(), "");
+    LIBCPP_ASSERT(noexcept(sp.back()));
     assert(std::addressof(sp.back()) == sp.data() + sp.size() - 1);
 }
 
@@ -71,5 +71,5 @@ int main(int, char**)
     testRuntimeSpan(std::span<std::string>   (&s, 1));
     testRuntimeSpan(std::span<std::string, 1>(&s, 1));
 
-  return 0;
+    return 0;
 }

Modified: libcxx/trunk/test/std/containers/views/span.elem/front.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/views/span.elem/front.pass.cpp?rev=357092&r1=357091&r2=357092&view=diff
==============================================================================
--- libcxx/trunk/test/std/containers/views/span.elem/front.pass.cpp (original)
+++ libcxx/trunk/test/std/containers/views/span.elem/front.pass.cpp Wed Mar 27 10:03:44 2019
@@ -26,7 +26,7 @@
 template <typename Span>
 constexpr bool testConstexprSpan(Span sp)
 {
-    _LIBCPP_ASSERT(sp.front(), "");
+    LIBCPP_ASSERT(noexcept(sp.front()));
     return std::addressof(sp.front()) == sp.data();
 }
 
@@ -34,7 +34,7 @@ constexpr bool testConstexprSpan(Span sp
 template <typename Span>
 void testRuntimeSpan(Span sp)
 {
-    _LIBCPP_ASSERT(sp.front(), "");
+    LIBCPP_ASSERT(noexcept(sp.front()));
     assert(std::addressof(sp.front()) == sp.data());
 }
 
@@ -71,5 +71,5 @@ int main(int, char**)
     testRuntimeSpan(std::span<std::string>   (&s, 1));
     testRuntimeSpan(std::span<std::string, 1>(&s, 1));
 
-  return 0;
+    return 0;
 }

Modified: libcxx/trunk/test/std/containers/views/span.elem/op_idx.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/views/span.elem/op_idx.pass.cpp?rev=357092&r1=357091&r2=357092&view=diff
==============================================================================
--- libcxx/trunk/test/std/containers/views/span.elem/op_idx.pass.cpp (original)
+++ libcxx/trunk/test/std/containers/views/span.elem/op_idx.pass.cpp Wed Mar 27 10:03:44 2019
@@ -25,7 +25,7 @@
 template <typename Span>
 constexpr bool testConstexprSpan(Span sp, size_t idx)
 {
-    _LIBCPP_ASSERT(noexcept(sp[idx]), "");
+    LIBCPP_ASSERT(noexcept(sp[idx]));
 
     typename Span::reference r1 = sp[idx];
     typename Span::reference r2 = *(sp.data() + idx);
@@ -36,7 +36,7 @@ constexpr bool testConstexprSpan(Span sp
 template <typename Span>
 void testRuntimeSpan(Span sp, size_t idx)
 {
-    _LIBCPP_ASSERT(noexcept(sp[idx]), "");
+    LIBCPP_ASSERT(noexcept(sp[idx]));
 
     typename Span::reference r1 = sp[idx];
     typename Span::reference r2 = *(sp.data() + idx);