[libcxx-commits] [libcxx] r354944 - Fix an ambiguity in the tests that gcc-tot complained about.
Marshall Clow via libcxx-commits
libcxx-commits at lists.llvm.org
Tue Feb 26 17:29:52 PST 2019
Author: marshall
Date: Tue Feb 26 17:29:52 2019
New Revision: 354944
URL: http://llvm.org/viewvc/llvm-project?rev=354944&view=rev
Log:
Fix an ambiguity in the tests that gcc-tot complained about.
Modified:
libcxx/trunk/test/std/containers/views/span.cons/assign.pass.cpp
libcxx/trunk/test/std/containers/views/span.iterators/begin.pass.cpp
libcxx/trunk/test/std/containers/views/span.iterators/end.pass.cpp
libcxx/trunk/test/std/containers/views/span.iterators/rbegin.pass.cpp
libcxx/trunk/test/std/containers/views/span.iterators/rend.pass.cpp
libcxx/trunk/test/std/containers/views/span.objectrep/as_bytes.pass.cpp
libcxx/trunk/test/std/containers/views/span.objectrep/as_writeable_bytes.fail.cpp
libcxx/trunk/test/std/containers/views/span.objectrep/as_writeable_bytes.pass.cpp
libcxx/trunk/test/std/containers/views/span.obs/empty.pass.cpp
libcxx/trunk/test/std/containers/views/span.obs/size.pass.cpp
libcxx/trunk/test/std/containers/views/span.obs/size_bytes.pass.cpp
Modified: libcxx/trunk/test/std/containers/views/span.cons/assign.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/views/span.cons/assign.pass.cpp?rev=354944&r1=354943&r2=354944&view=diff
==============================================================================
--- libcxx/trunk/test/std/containers/views/span.cons/assign.pass.cpp (original)
+++ libcxx/trunk/test/std/containers/views/span.cons/assign.pass.cpp Tue Feb 26 17:29:52 2019
@@ -55,18 +55,18 @@ int main(int, char**)
// On darwin i386, ptrdiff_t is the same as int.
constexpr std::span<const int> spans[] = {
{},
- {carr1, static_cast<std::ptrdiff_t>(0)},
- {carr1, 1},
- {carr1, 2},
- {carr1, 3},
- {carr1, 4},
- {carr2, static_cast<std::ptrdiff_t>(0)},
- {carr2, 1},
- {carr2, 2},
- {carr2, 3},
- {carr3, static_cast<std::ptrdiff_t>(0)},
- {carr3, 1},
- {carr3, 2}
+ {carr1, static_cast<std::size_t>(0)},
+ {carr1, 1U},
+ {carr1, 2U},
+ {carr1, 3U},
+ {carr1, 4U},
+ {carr2, static_cast<std::size_t>(0)},
+ {carr2, 1U},
+ {carr2, 2U},
+ {carr2, 3U},
+ {carr3, static_cast<std::size_t>(0)},
+ {carr3, 1U},
+ {carr3, 2U}
};
static_assert(std::size(spans) == 13, "" );
Modified: libcxx/trunk/test/std/containers/views/span.iterators/begin.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/views/span.iterators/begin.pass.cpp?rev=354944&r1=354943&r2=354944&view=diff
==============================================================================
--- libcxx/trunk/test/std/containers/views/span.iterators/begin.pass.cpp (original)
+++ libcxx/trunk/test/std/containers/views/span.iterators/begin.pass.cpp Tue Feb 26 17:29:52 2019
@@ -110,7 +110,7 @@ int main(int, char**)
testRuntimeSpan(std::span<int>(iArr2, 5));
std::string s;
- testRuntimeSpan(std::span<std::string>(&s, (std::ptrdiff_t) 0));
+ testRuntimeSpan(std::span<std::string>(&s, (std::size_t) 0));
testRuntimeSpan(std::span<std::string>(&s, 1));
return 0;
Modified: libcxx/trunk/test/std/containers/views/span.iterators/end.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/views/span.iterators/end.pass.cpp?rev=354944&r1=354943&r2=354944&view=diff
==============================================================================
--- libcxx/trunk/test/std/containers/views/span.iterators/end.pass.cpp (original)
+++ libcxx/trunk/test/std/containers/views/span.iterators/end.pass.cpp Tue Feb 26 17:29:52 2019
@@ -118,7 +118,7 @@ int main(int, char**)
testRuntimeSpan(std::span<int>(iArr2, 5));
std::string s;
- testRuntimeSpan(std::span<std::string>(&s, (std::ptrdiff_t) 0));
+ testRuntimeSpan(std::span<std::string>(&s, (std::size_t) 0));
testRuntimeSpan(std::span<std::string>(&s, 1));
return 0;
Modified: libcxx/trunk/test/std/containers/views/span.iterators/rbegin.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/views/span.iterators/rbegin.pass.cpp?rev=354944&r1=354943&r2=354944&view=diff
==============================================================================
--- libcxx/trunk/test/std/containers/views/span.iterators/rbegin.pass.cpp (original)
+++ libcxx/trunk/test/std/containers/views/span.iterators/rbegin.pass.cpp Tue Feb 26 17:29:52 2019
@@ -111,7 +111,7 @@ int main(int, char**)
testRuntimeSpan(std::span<int>(iArr2, 5));
std::string s;
- testRuntimeSpan(std::span<std::string>(&s, static_cast<std::ptrdiff_t>(0)));
+ testRuntimeSpan(std::span<std::string>(&s, static_cast<std::size_t>(0)));
testRuntimeSpan(std::span<std::string>(&s, 1));
return 0;
Modified: libcxx/trunk/test/std/containers/views/span.iterators/rend.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/views/span.iterators/rend.pass.cpp?rev=354944&r1=354943&r2=354944&view=diff
==============================================================================
--- libcxx/trunk/test/std/containers/views/span.iterators/rend.pass.cpp (original)
+++ libcxx/trunk/test/std/containers/views/span.iterators/rend.pass.cpp Tue Feb 26 17:29:52 2019
@@ -112,7 +112,7 @@ int main(int, char**)
testRuntimeSpan(std::span<int>(iArr2, 5));
std::string s;
- testRuntimeSpan(std::span<std::string>(&s, (std::ptrdiff_t) 0));
+ testRuntimeSpan(std::span<std::string>(&s, (std::size_t) 0));
testRuntimeSpan(std::span<std::string>(&s, 1));
return 0;
Modified: libcxx/trunk/test/std/containers/views/span.objectrep/as_bytes.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/views/span.objectrep/as_bytes.pass.cpp?rev=354944&r1=354943&r2=354944&view=diff
==============================================================================
--- libcxx/trunk/test/std/containers/views/span.objectrep/as_bytes.pass.cpp (original)
+++ libcxx/trunk/test/std/containers/views/span.objectrep/as_bytes.pass.cpp Tue Feb 26 17:29:52 2019
@@ -72,7 +72,7 @@ int main(int, char**)
testRuntimeSpan(std::span<int, 5>(iArr2 + 1, 5));
std::string s;
- testRuntimeSpan(std::span<std::string>(&s, (std::ptrdiff_t) 0));
+ testRuntimeSpan(std::span<std::string>(&s, (std::size_t) 0));
testRuntimeSpan(std::span<std::string>(&s, 1));
return 0;
Modified: libcxx/trunk/test/std/containers/views/span.objectrep/as_writeable_bytes.fail.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/views/span.objectrep/as_writeable_bytes.fail.cpp?rev=354944&r1=354943&r2=354944&view=diff
==============================================================================
--- libcxx/trunk/test/std/containers/views/span.objectrep/as_writeable_bytes.fail.cpp (original)
+++ libcxx/trunk/test/std/containers/views/span.objectrep/as_writeable_bytes.fail.cpp Tue Feb 26 17:29:52 2019
@@ -40,7 +40,7 @@ int main(int, char**)
std::as_writeable_bytes(std::span<const long, 0>()); // expected-error {{no matching function for call to 'as_writeable_bytes'}}
std::as_writeable_bytes(std::span<const double, 0>()); // expected-error {{no matching function for call to 'as_writeable_bytes'}}
std::as_writeable_bytes(std::span<const A, 0>()); // expected-error {{no matching function for call to 'as_writeable_bytes'}}
- std::as_writeable_bytes(std::span<const std::string, 0>()); // expected-error {{no matching function for call to 'as_writeable_bytes'}}
+ std::as_writeable_bytes(std::span<const std::string, (size_t)0>()); // expected-error {{no matching function for call to 'as_writeable_bytes'}}
std::as_writeable_bytes(std::span<const int> (iArr2, 1)); // expected-error {{no matching function for call to 'as_writeable_bytes'}}
std::as_writeable_bytes(std::span<const int, 1>(iArr2 + 5, 1)); // expected-error {{no matching function for call to 'as_writeable_bytes'}}
Modified: libcxx/trunk/test/std/containers/views/span.objectrep/as_writeable_bytes.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/views/span.objectrep/as_writeable_bytes.pass.cpp?rev=354944&r1=354943&r2=354944&view=diff
==============================================================================
--- libcxx/trunk/test/std/containers/views/span.objectrep/as_writeable_bytes.pass.cpp (original)
+++ libcxx/trunk/test/std/containers/views/span.objectrep/as_writeable_bytes.pass.cpp Tue Feb 26 17:29:52 2019
@@ -72,7 +72,7 @@ int main(int, char**)
testRuntimeSpan(std::span<int, 5>(iArr2 + 1, 5));
std::string s;
- testRuntimeSpan(std::span<std::string>(&s, (std::ptrdiff_t) 0));
+ testRuntimeSpan(std::span<std::string>(&s, (std::size_t) 0));
testRuntimeSpan(std::span<std::string>(&s, 1));
return 0;
Modified: libcxx/trunk/test/std/containers/views/span.obs/empty.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/views/span.obs/empty.pass.cpp?rev=354944&r1=354943&r2=354944&view=diff
==============================================================================
--- libcxx/trunk/test/std/containers/views/span.obs/empty.pass.cpp (original)
+++ libcxx/trunk/test/std/containers/views/span.obs/empty.pass.cpp Tue Feb 26 17:29:52 2019
@@ -67,7 +67,7 @@ int main(int, char**)
assert(!(std::span<int, 5>(iArr2, 5).empty()));
std::string s;
- assert( ((std::span<std::string>(&s, (std::ptrdiff_t) 0)).empty()));
+ assert( ((std::span<std::string>(&s, (std::size_t) 0)).empty()));
assert(!((std::span<std::string>(&s, 1).empty())));
return 0;
Modified: libcxx/trunk/test/std/containers/views/span.obs/size.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/views/span.obs/size.pass.cpp?rev=354944&r1=354943&r2=354944&view=diff
==============================================================================
--- libcxx/trunk/test/std/containers/views/span.obs/size.pass.cpp (original)
+++ libcxx/trunk/test/std/containers/views/span.obs/size.pass.cpp Tue Feb 26 17:29:52 2019
@@ -85,7 +85,7 @@ int main(int, char**)
testRuntimeSpan(std::span<int, 5>(iArr2 + 1, 5), 5);
std::string s;
- testRuntimeSpan(std::span<std::string>(&s, (std::ptrdiff_t) 0), 0);
+ testRuntimeSpan(std::span<std::string>(&s, (std::size_t) 0), 0);
testRuntimeSpan(std::span<std::string>(&s, 1), 1);
return 0;
Modified: libcxx/trunk/test/std/containers/views/span.obs/size_bytes.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/views/span.obs/size_bytes.pass.cpp?rev=354944&r1=354943&r2=354944&view=diff
==============================================================================
--- libcxx/trunk/test/std/containers/views/span.obs/size_bytes.pass.cpp (original)
+++ libcxx/trunk/test/std/containers/views/span.obs/size_bytes.pass.cpp Tue Feb 26 17:29:52 2019
@@ -86,7 +86,7 @@ int main(int, char**)
testRuntimeSpan(std::span<int, 5>(iArr2 + 1, 5), 5);
std::string s;
- testRuntimeSpan(std::span<std::string>(&s, (std::ptrdiff_t) 0), 0);
+ testRuntimeSpan(std::span<std::string>(&s, (std::size_t) 0), 0);
testRuntimeSpan(std::span<std::string>(&s, 1), 1);
return 0;
More information about the libcxx-commits
mailing list