From: Jonathan Wakely <jwakely@redhat.com>
Date: Thu, 18 May 2017 15:31:17 +0000 (+0100)
Subject: Uncomment std::reference_wrapper tests that no longer fail
X-Git-Tag: releases/gcc-5.5.0~350
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=96964b4ba972fdf35f15ed594ae78902b843849a;p=thirdparty%2Fgcc.git

Uncomment std::reference_wrapper tests that no longer fail

Backport from mainline
2017-04-03  Jonathan Wakely  <jwakely@redhat.com>

	* testsuite/20_util/reference_wrapper/invoke.cc: Uncomment tests
	that no longer fail.

From-SVN: r248235
---

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index ba41e4a987b8..d978dc32074e 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -3,6 +3,12 @@
 	Backport from mainline
 	2017-04-03  Jonathan Wakely  <jwakely@redhat.com>
 
+	* testsuite/20_util/reference_wrapper/invoke.cc: Uncomment tests
+	that no longer fail.
+
+	Backport from mainline
+	2017-04-03  Jonathan Wakely  <jwakely@redhat.com>
+
 	* include/bits/ios_base.h: Correct comment.
 	* testsuite/util/testsuite_hooks.h: Likewise.
 
diff --git a/libstdc++-v3/testsuite/20_util/reference_wrapper/invoke.cc b/libstdc++-v3/testsuite/20_util/reference_wrapper/invoke.cc
index 7ecc5292219c..bbbaed231c6c 100644
--- a/libstdc++-v3/testsuite/20_util/reference_wrapper/invoke.cc
+++ b/libstdc++-v3/testsuite/20_util/reference_wrapper/invoke.cc
@@ -75,8 +75,7 @@ void test01()
   int (::X::* p_foo_c)(float) const = &::X::foo_c;
   int (::X::* p_foo_v)(float) volatile = &::X::foo_v;
   int (::X::* p_foo_cv)(float) const volatile = &::X::foo_cv;
-  int (::X::* p_foo_varargs)(float, ...) __attribute__((unused))
-    = &::X::foo_varargs;
+  int (::X::* p_foo_varargs)(float, ...) = &::X::foo_varargs;
   int ::X::* p_bar = &::X::bar;
 
   const float pi = 3.14;
@@ -98,10 +97,10 @@ void test01()
   VERIFY(ref(p_foo_v)(xp, pi) == 3);
   VERIFY(ref(p_foo_cv)(x, pi) == 3);
   VERIFY(ref(p_foo_cv)(xp, pi) == 3);
-  // VERIFY(ref(p_foo_varargs)(x, pi) == 3);
-  // VERIFY(ref(p_foo_varargs)(xp, pi, 1, 1) == 3);
-  // VERIFY(ref(p_foo_varargs)(x, pi, 1, 1) == 3);
-  // VERIFY(ref(p_foo_varargs)(xp, pi) == 3);
+  VERIFY(ref(p_foo_varargs)(x, pi) == 3);
+  VERIFY(ref(p_foo_varargs)(xp, pi, 1, 1) == 3);
+  VERIFY(ref(p_foo_varargs)(x, pi, 1, 1) == 3);
+  VERIFY(ref(p_foo_varargs)(xp, pi) == 3);
 
   // Member data pointers
   VERIFY(ref(p_bar)(x) == 17);