[libcxx] [test] Use the correct type from strlen. Include correct header.
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@329665 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/test/std/depr/depr.str.strstreams/depr.strstreambuf/depr.strstreambuf.cons/cp_size_cp.pass.cpp b/test/std/depr/depr.str.strstreams/depr.strstreambuf/depr.strstreambuf.cons/cp_size_cp.pass.cpp
index 5d345f1..1bac82d 100644
--- a/test/std/depr/depr.str.strstreams/depr.strstreambuf/depr.strstreambuf.cons/cp_size_cp.pass.cpp
+++ b/test/std/depr/depr.str.strstreams/depr.strstreambuf/depr.strstreambuf.cons/cp_size_cp.pass.cpp
@@ -15,6 +15,7 @@
#include <strstream>
#include <cassert>
+#include <cstring>
int main()
{
@@ -71,8 +72,8 @@
}
{
char buf[10] = "abcd";
- int s = std::strlen(buf);
- std::strstreambuf sb(buf, sizeof(buf)-s, buf + s);
+ std::size_t s = std::strlen(buf);
+ std::strstreambuf sb(buf, sizeof(buf) - s, buf + s);
assert(sb.sgetc() == 'a');
assert(sb.snextc() == 'b');
assert(sb.snextc() == 'c');
diff --git a/test/std/depr/depr.str.strstreams/depr.strstreambuf/depr.strstreambuf.cons/scp_size_scp.pass.cpp b/test/std/depr/depr.str.strstreams/depr.strstreambuf/depr.strstreambuf.cons/scp_size_scp.pass.cpp
index c827850..289b61f 100644
--- a/test/std/depr/depr.str.strstreams/depr.strstreambuf/depr.strstreambuf.cons/scp_size_scp.pass.cpp
+++ b/test/std/depr/depr.str.strstreams/depr.strstreambuf/depr.strstreambuf.cons/scp_size_scp.pass.cpp
@@ -15,6 +15,7 @@
#include <strstream>
#include <cassert>
+#include <cstring>
int main()
{
@@ -71,8 +72,8 @@
}
{
signed char buf[10] = "abcd";
- int s = std::strlen((char*)buf);
- std::strstreambuf sb(buf, sizeof(buf)-s, buf + s);
+ std::size_t s = std::strlen((char*)buf);
+ std::strstreambuf sb(buf, sizeof(buf) - s, buf + s);
assert(sb.sgetc() == 'a');
assert(sb.snextc() == 'b');
assert(sb.snextc() == 'c');
diff --git a/test/std/depr/depr.str.strstreams/depr.strstreambuf/depr.strstreambuf.cons/ucp_size_ucp.pass.cpp b/test/std/depr/depr.str.strstreams/depr.strstreambuf/depr.strstreambuf.cons/ucp_size_ucp.pass.cpp
index 46c11e4..b0920f7 100644
--- a/test/std/depr/depr.str.strstreams/depr.strstreambuf/depr.strstreambuf.cons/ucp_size_ucp.pass.cpp
+++ b/test/std/depr/depr.str.strstreams/depr.strstreambuf/depr.strstreambuf.cons/ucp_size_ucp.pass.cpp
@@ -15,6 +15,7 @@
#include <strstream>
#include <cassert>
+#include <cstring>
int main()
{
@@ -71,8 +72,8 @@
}
{
unsigned char buf[10] = "abcd";
- int s = std::strlen((char*)buf);
- std::strstreambuf sb(buf, sizeof(buf)-s, buf + s);
+ std::size_t s = std::strlen((char*)buf);
+ std::strstreambuf sb(buf, sizeof(buf) - s, buf + s);
assert(sb.sgetc() == 'a');
assert(sb.snextc() == 'b');
assert(sb.snextc() == 'c');
diff --git a/test/std/input.output/iostream.format/input.streams/istream.formatted/istream_extractors/streambuf.pass.cpp b/test/std/input.output/iostream.format/input.streams/istream.formatted/istream_extractors/streambuf.pass.cpp
index 6b6737a..ccd043c 100644
--- a/test/std/input.output/iostream.format/input.streams/istream.formatted/istream_extractors/streambuf.pass.cpp
+++ b/test/std/input.output/iostream.format/input.streams/istream.formatted/istream_extractors/streambuf.pass.cpp
@@ -45,7 +45,7 @@
{
if (ch != base::traits_type::eof())
{
- int n = str_.size();
+ std::size_t n = str_.size();
str_.push_back(static_cast<CharT>(ch));
str_.resize(str_.capacity());
base::setp(const_cast<CharT*>(str_.data()),
