Commit 0fb9dc36 by Jonathan Wakely Committed by Jonathan Wakely

Fix new test that fails in C++98 mode

	* testsuite/20_util/function_objects/comparisons_pointer.cc: Adjust
	to compile as C++98.

From-SVN: r258623
parent 5e6ae0cc
2018-03-17 Jonathan Wakely <jwakely@redhat.com>
* testsuite/20_util/function_objects/comparisons_pointer.cc: Adjust
to compile as C++98.
2018-03-14 Jonathan Wakely <jwakely@redhat.com> 2018-03-14 Jonathan Wakely <jwakely@redhat.com>
PR libstdc++/78420 PR libstdc++/78420
......
...@@ -27,7 +27,7 @@ int a[8]; ...@@ -27,7 +27,7 @@ int a[8];
void void
test01() test01()
{ {
auto p = a + 8; int* p = a + 8;
std::greater<int*> gt; std::greater<int*> gt;
std::stringstream ss; std::stringstream ss;
...@@ -44,7 +44,7 @@ test01() ...@@ -44,7 +44,7 @@ test01()
ss.str(""); ss.str("");
ss.clear(); ss.clear();
sum = 0; sum = 0;
auto p2 = a + 8; int* p2 = a + 8;
std::greater<> gt2; std::greater<> gt2;
ss << gt2(p2, b) << ' ' << gt2(b, p2) << ' ' << (!gt2(p2, b) && !gt2(b, p2)); ss << gt2(p2, b) << ' ' << gt2(b, p2) << ' ' << (!gt2(p2, b) && !gt2(b, p2));
while (ss >> n) while (ss >> n)
...@@ -59,7 +59,7 @@ test01() ...@@ -59,7 +59,7 @@ test01()
void void
test02() test02()
{ {
auto p = a + 8; int* p = a + 8;
std::less<int*> lt; std::less<int*> lt;
std::stringstream ss; std::stringstream ss;
...@@ -76,7 +76,7 @@ test02() ...@@ -76,7 +76,7 @@ test02()
ss.str(""); ss.str("");
ss.clear(); ss.clear();
sum = 0; sum = 0;
auto p2 = a + 8; int* p2 = a + 8;
std::less<> lt2; std::less<> lt2;
ss << lt2(p2, b) << ' ' << lt2(b, p2) << ' ' << (!lt2(p2, b) && !lt2(b, p2)); ss << lt2(p2, b) << ' ' << lt2(b, p2) << ' ' << (!lt2(p2, b) && !lt2(b, p2));
while (ss >> n) while (ss >> n)
...@@ -91,7 +91,7 @@ test02() ...@@ -91,7 +91,7 @@ test02()
void void
test03() test03()
{ {
auto p = a + 8; int* p = a + 8;
std::greater_equal<int*> ge; std::greater_equal<int*> ge;
std::stringstream ss; std::stringstream ss;
...@@ -109,7 +109,7 @@ test03() ...@@ -109,7 +109,7 @@ test03()
ss.str(""); ss.str("");
ss.clear(); ss.clear();
sum = 0; sum = 0;
auto p2 = a + 8; int* p2 = a + 8;
std::greater_equal<> ge2; std::greater_equal<> ge2;
ss << !ge2(p2, b) << ' ' << !ge2(b, p2) << ' ' << (ge2(p2, b) && ge2(b, p2)); ss << !ge2(p2, b) << ' ' << !ge2(b, p2) << ' ' << (ge2(p2, b) && ge2(b, p2));
while (ss >> n) while (ss >> n)
...@@ -125,7 +125,7 @@ test03() ...@@ -125,7 +125,7 @@ test03()
void void
test04() test04()
{ {
auto p = a + 8; int* p = a + 8;
std::less_equal<int*> le; std::less_equal<int*> le;
std::stringstream ss; std::stringstream ss;
...@@ -143,7 +143,7 @@ test04() ...@@ -143,7 +143,7 @@ test04()
ss.str(""); ss.str("");
ss.clear(); ss.clear();
sum = 0; sum = 0;
auto p2 = a + 8; int* p2 = a + 8;
std::less_equal<> le2; std::less_equal<> le2;
ss << !le2(p2, b) << ' ' << !le2(b, p2) << ' ' << (le2(p2, b) && le2(b, p2)); ss << !le2(p2, b) << ' ' << !le2(b, p2) << ' ' << (le2(p2, b) && le2(b, p2));
while (ss >> n) while (ss >> n)
...@@ -167,7 +167,7 @@ void ...@@ -167,7 +167,7 @@ void
test05() test05()
{ {
std::less<const X*> lt; std::less<const X*> lt;
auto p = y + 4; X* p = y + 4;
std::stringstream ss; std::stringstream ss;
ss << lt(x, p) << ' ' << lt(p, x) << ' ' << (!lt(p, x) && !lt(x, p)); ss << lt(x, p) << ' ' << lt(p, x) << ' ' << (!lt(p, x) && !lt(x, p));
int sum = 0; int sum = 0;
...@@ -183,7 +183,7 @@ test05() ...@@ -183,7 +183,7 @@ test05()
ss.str(""); ss.str("");
ss.clear(); ss.clear();
sum = 0; sum = 0;
auto p2 = y + 4; X* p2 = y + 4;
std::less<> lt2; std::less<> lt2;
ss << lt2(x, p2) << ' ' << lt2(p2, x) << ' ' << (!lt2(x, p2) && !lt2(p2, x)); ss << lt2(x, p2) << ' ' << lt2(p2, x) << ' ' << (!lt2(x, p2) && !lt2(p2, x));
while (ss >> n) while (ss >> n)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment