[libcxx-commits] [libcxx] 98bb747 - [libc++] [test] Qualify calls to std::getline. NFCI.
Arthur O'Dwyer via libcxx-commits
libcxx-commits at lists.llvm.org
Wed Feb 16 08:04:16 PST 2022
Author: Arthur O'Dwyer
Date: 2022-02-16T11:03:33-05:00
New Revision: 98bb747c8705236ece7fc76a3d243b2c3c695ad5
URL: https://github.com/llvm/llvm-project/commit/98bb747c8705236ece7fc76a3d243b2c3c695ad5
DIFF: https://github.com/llvm/llvm-project/commit/98bb747c8705236ece7fc76a3d243b2c3c695ad5.diff
LOG: [libc++] [test] Qualify calls to std::getline. NFCI.
Reviewed as part of D119860.
Added:
Modified:
libcxx/test/std/strings/basic.string/string.nonmembers/string.io/get_line.pass.cpp
libcxx/test/std/strings/basic.string/string.nonmembers/string.io/get_line_delim.pass.cpp
libcxx/test/std/strings/basic.string/string.nonmembers/string.io/get_line_delim_rv.pass.cpp
libcxx/test/std/strings/basic.string/string.nonmembers/string.io/get_line_rv.pass.cpp
Removed:
################################################################################
diff --git a/libcxx/test/std/strings/basic.string/string.nonmembers/string.io/get_line.pass.cpp b/libcxx/test/std/strings/basic.string/string.nonmembers/string.io/get_line.pass.cpp
index b1fdf57a236c8..aa00fc90d192b 100644
--- a/libcxx/test/std/strings/basic.string/string.nonmembers/string.io/get_line.pass.cpp
+++ b/libcxx/test/std/strings/basic.string/string.nonmembers/string.io/get_line.pass.cpp
@@ -25,13 +25,13 @@ int main(int, char**)
{
std::istringstream in(" abc\n def\n ghij");
std::string s("initial text");
- getline(in, s);
+ std::getline(in, s);
assert(in.good());
assert(s == " abc");
- getline(in, s);
+ std::getline(in, s);
assert(in.good());
assert(s == " def");
- getline(in, s);
+ std::getline(in, s);
assert(in.eof());
assert(s == " ghij");
}
@@ -39,13 +39,13 @@ int main(int, char**)
{
std::wistringstream in(L" abc\n def\n ghij");
std::wstring s(L"initial text");
- getline(in, s);
+ std::getline(in, s);
assert(in.good());
assert(s == L" abc");
- getline(in, s);
+ std::getline(in, s);
assert(in.good());
assert(s == L" def");
- getline(in, s);
+ std::getline(in, s);
assert(in.eof());
assert(s == L" ghij");
}
@@ -55,13 +55,13 @@ int main(int, char**)
typedef std::basic_string<char, std::char_traits<char>, min_allocator<char>> S;
std::istringstream in(" abc\n def\n ghij");
S s("initial text");
- getline(in, s);
+ std::getline(in, s);
assert(in.good());
assert(s == " abc");
- getline(in, s);
+ std::getline(in, s);
assert(in.good());
assert(s == " def");
- getline(in, s);
+ std::getline(in, s);
assert(in.eof());
assert(s == " ghij");
}
@@ -70,13 +70,13 @@ int main(int, char**)
typedef std::basic_string<wchar_t, std::char_traits<wchar_t>, min_allocator<wchar_t>> S;
std::wistringstream in(L" abc\n def\n ghij");
S s(L"initial text");
- getline(in, s);
+ std::getline(in, s);
assert(in.good());
assert(s == L" abc");
- getline(in, s);
+ std::getline(in, s);
assert(in.good());
assert(s == L" def");
- getline(in, s);
+ std::getline(in, s);
assert(in.eof());
assert(s == L" ghij");
}
diff --git a/libcxx/test/std/strings/basic.string/string.nonmembers/string.io/get_line_delim.pass.cpp b/libcxx/test/std/strings/basic.string/string.nonmembers/string.io/get_line_delim.pass.cpp
index c94e6c24a13f8..189979409c406 100644
--- a/libcxx/test/std/strings/basic.string/string.nonmembers/string.io/get_line_delim.pass.cpp
+++ b/libcxx/test/std/strings/basic.string/string.nonmembers/string.io/get_line_delim.pass.cpp
@@ -25,16 +25,16 @@ int main(int, char**)
{
std::istringstream in(" abc* def** ghij");
std::string s("initial text");
- getline(in, s, '*');
+ std::getline(in, s, '*');
assert(in.good());
assert(s == " abc");
- getline(in, s, '*');
+ std::getline(in, s, '*');
assert(in.good());
assert(s == " def");
- getline(in, s, '*');
+ std::getline(in, s, '*');
assert(in.good());
assert(s == "");
- getline(in, s, '*');
+ std::getline(in, s, '*');
assert(in.eof());
assert(s == " ghij");
}
@@ -42,16 +42,16 @@ int main(int, char**)
{
std::wistringstream in(L" abc* def** ghij");
std::wstring s(L"initial text");
- getline(in, s, L'*');
+ std::getline(in, s, L'*');
assert(in.good());
assert(s == L" abc");
- getline(in, s, L'*');
+ std::getline(in, s, L'*');
assert(in.good());
assert(s == L" def");
- getline(in, s, L'*');
+ std::getline(in, s, L'*');
assert(in.good());
assert(s == L"");
- getline(in, s, L'*');
+ std::getline(in, s, L'*');
assert(in.eof());
assert(s == L" ghij");
}
@@ -61,16 +61,16 @@ int main(int, char**)
typedef std::basic_string<char, std::char_traits<char>, min_allocator<char>> S;
std::istringstream in(" abc* def** ghij");
S s("initial text");
- getline(in, s, '*');
+ std::getline(in, s, '*');
assert(in.good());
assert(s == " abc");
- getline(in, s, '*');
+ std::getline(in, s, '*');
assert(in.good());
assert(s == " def");
- getline(in, s, '*');
+ std::getline(in, s, '*');
assert(in.good());
assert(s == "");
- getline(in, s, '*');
+ std::getline(in, s, '*');
assert(in.eof());
assert(s == " ghij");
}
@@ -79,16 +79,16 @@ int main(int, char**)
typedef std::basic_string<wchar_t, std::char_traits<wchar_t>, min_allocator<wchar_t>> S;
std::wistringstream in(L" abc* def** ghij");
S s(L"initial text");
- getline(in, s, L'*');
+ std::getline(in, s, L'*');
assert(in.good());
assert(s == L" abc");
- getline(in, s, L'*');
+ std::getline(in, s, L'*');
assert(in.good());
assert(s == L" def");
- getline(in, s, L'*');
+ std::getline(in, s, L'*');
assert(in.good());
assert(s == L"");
- getline(in, s, L'*');
+ std::getline(in, s, L'*');
assert(in.eof());
assert(s == L" ghij");
}
diff --git a/libcxx/test/std/strings/basic.string/string.nonmembers/string.io/get_line_delim_rv.pass.cpp b/libcxx/test/std/strings/basic.string/string.nonmembers/string.io/get_line_delim_rv.pass.cpp
index 077a1a8e0bfcb..8e14148207b25 100644
--- a/libcxx/test/std/strings/basic.string/string.nonmembers/string.io/get_line_delim_rv.pass.cpp
+++ b/libcxx/test/std/strings/basic.string/string.nonmembers/string.io/get_line_delim_rv.pass.cpp
@@ -24,27 +24,27 @@ int main(int, char**)
{
{
std::string s("initial text");
- getline(std::istringstream(" abc* def* ghij"), s, '*');
+ std::getline(std::istringstream(" abc* def* ghij"), s, '*');
assert(s == " abc");
}
#ifndef TEST_HAS_NO_WIDE_CHARACTERS
{
std::wstring s(L"initial text");
- getline(std::wistringstream(L" abc* def* ghij"), s, L'*');
+ std::getline(std::wistringstream(L" abc* def* ghij"), s, L'*');
assert(s == L" abc");
}
#endif
{
typedef std::basic_string<char, std::char_traits<char>, min_allocator<char> > S;
S s("initial text");
- getline(std::istringstream(" abc* def* ghij"), s, '*');
+ std::getline(std::istringstream(" abc* def* ghij"), s, '*');
assert(s == " abc");
}
#ifndef TEST_HAS_NO_WIDE_CHARACTERS
{
typedef std::basic_string<wchar_t, std::char_traits<wchar_t>, min_allocator<wchar_t> > S;
S s(L"initial text");
- getline(std::wistringstream(L" abc* def* ghij"), s, L'*');
+ std::getline(std::wistringstream(L" abc* def* ghij"), s, L'*');
assert(s == L" abc");
}
#endif
diff --git a/libcxx/test/std/strings/basic.string/string.nonmembers/string.io/get_line_rv.pass.cpp b/libcxx/test/std/strings/basic.string/string.nonmembers/string.io/get_line_rv.pass.cpp
index aef90477eeb68..146b56285f94c 100644
--- a/libcxx/test/std/strings/basic.string/string.nonmembers/string.io/get_line_rv.pass.cpp
+++ b/libcxx/test/std/strings/basic.string/string.nonmembers/string.io/get_line_rv.pass.cpp
@@ -24,27 +24,27 @@ int main(int, char**)
{
{
std::string s("initial text");
- getline(std::istringstream(" abc\n def\n ghij"), s);
+ std::getline(std::istringstream(" abc\n def\n ghij"), s);
assert(s == " abc");
}
#ifndef TEST_HAS_NO_WIDE_CHARACTERS
{
std::wstring s(L"initial text");
- getline(std::wistringstream(L" abc\n def\n ghij"), s);
+ std::getline(std::wistringstream(L" abc\n def\n ghij"), s);
assert(s == L" abc");
}
#endif
{
typedef std::basic_string<char, std::char_traits<char>, min_allocator<char> > S;
S s("initial text");
- getline(std::istringstream(" abc\n def\n ghij"), s);
+ std::getline(std::istringstream(" abc\n def\n ghij"), s);
assert(s == " abc");
}
#ifndef TEST_HAS_NO_WIDE_CHARACTERS
{
typedef std::basic_string<wchar_t, std::char_traits<wchar_t>, min_allocator<wchar_t> > S;
S s(L"initial text");
- getline(std::wistringstream(L" abc\n def\n ghij"), s);
+ std::getline(std::wistringstream(L" abc\n def\n ghij"), s);
assert(s == L" abc");
}
#endif
More information about the libcxx-commits
mailing list