From: Jonathan Wakely <jwakely@redhat.com>
Date: Wed, 17 Aug 2016 13:38:58 +0000 (+0100)
Subject: Adjust testcase for C++14 compatibility
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=ba364478df0735b8e7fa1ee1e7711a385b4d2db0;p=gcc.git

Adjust testcase for C++14 compatibility

	* testsuite/24_iterators/headers/iterator/range_access.cc: Adjust
	expected signatures for C++14 compatibility.

From-SVN: r239533
---

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index bbf2b19665d..2016a95c5da 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,8 @@
 2016-08-17  Jonathan Wakely  <jwakely@redhat.com>
 
+	* testsuite/24_iterators/headers/iterator/range_access.cc: Adjust
+	expected signatures for C++14 compatibility.
+
 	PR libstdc++/77264
 	* include/bits/basic_string.h (operator=(__sv_type)
 	(append(__sv_type), assign(__sv_type), insert(size_type, __sv_type))
diff --git a/libstdc++-v3/testsuite/24_iterators/headers/iterator/range_access.cc b/libstdc++-v3/testsuite/24_iterators/headers/iterator/range_access.cc
index b66381ecd45..873a730274e 100644
--- a/libstdc++-v3/testsuite/24_iterators/headers/iterator/range_access.cc
+++ b/libstdc++-v3/testsuite/24_iterators/headers/iterator/range_access.cc
@@ -1,5 +1,4 @@
-// { dg-do compile }
-// { dg-options "-std=gnu++11" }
+// { dg-do compile { target c++11 } }
 
 // Copyright (C) 2010-2016 Free Software Foundation, Inc.
 //
@@ -28,6 +27,11 @@ namespace std
   template<class C> auto end(C& c) -> decltype(c.end());
   template<class C> auto end(const C& c) -> decltype(c.end());
 
+#if __cplusplus >= 201402L
+  template<class T, size_t N> constexpr T* begin(T (&array)[N]);
+  template<class T, size_t N> constexpr T* end(T (&array)[N]);
+#else
   template<class T, size_t N> T* begin(T (&array)[N]);
   template<class T, size_t N> T* end(T (&array)[N]);
+#endif
 }