From d62775cd7dfcd911e983abf97d7c9e1f18ad6420 Mon Sep 17 00:00:00 2001
From: redi <redi@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Thu, 27 Aug 2015 19:05:19 +0000
Subject: [PATCH] 	PR libstdc++/67374 	* include/bits/range_access.h
 (valarray, begin, end): Declare. 	*
 testsuite/26_numerics/valarray/range_access.cc: Test const 	overloads. 
 * testsuite/26_numerics/valarray/range_access2.cc: New.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@227274 138bc75d-0d04-0410-961f-82ee72b054a4
---
 libstdc++-v3/ChangeLog                                      |  8 ++++++++
 libstdc++-v3/include/bits/range_access.h                    |  8 ++++++++
 libstdc++-v3/testsuite/26_numerics/valarray/range_access.cc |  3 +++
 .../valarray/{range_access.cc => range_access2.cc}          | 13 +++++++++----
 4 files changed, 28 insertions(+), 4 deletions(-)
 copy libstdc++-v3/testsuite/26_numerics/valarray/{range_access.cc => range_access2.cc} (79%)

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index e74daf479a5..9b269f8a747 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,11 @@
+2015-08-27  Jonathan Wakely  <jwakely@redhat.com>
+
+	PR libstdc++/67374
+	* include/bits/range_access.h (valarray, begin, end): Declare.
+	* testsuite/26_numerics/valarray/range_access.cc: Test const
+	overloads.
+	* testsuite/26_numerics/valarray/range_access2.cc: New.
+
 2015-08-27  John Marino  <gnugcc@marino.st>
 
 	* acinclude.m4 (*-*-dragonfly*): Change 7 locale support files
diff --git a/libstdc++-v3/include/bits/range_access.h b/libstdc++-v3/include/bits/range_access.h
index aa78afb7ed8..01a05bc13fd 100644
--- a/libstdc++-v3/include/bits/range_access.h
+++ b/libstdc++-v3/include/bits/range_access.h
@@ -98,6 +98,14 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
     { return __arr + _Nm; }
 
 #if __cplusplus >= 201402L
+
+  template<typename _Tp> class valarray;
+  // These overloads must be declared for cbegin and cend to use them.
+  template<typename _Tp> _Tp* begin(valarray<_Tp>&);
+  template<typename _Tp> const _Tp* begin(const valarray<_Tp>&);
+  template<typename _Tp> _Tp* end(valarray<_Tp>&);
+  template<typename _Tp> const _Tp* end(const valarray<_Tp>&);
+
   /**
    *  @brief  Return an iterator pointing to the first element of
    *          the const container.
diff --git a/libstdc++-v3/testsuite/26_numerics/valarray/range_access.cc b/libstdc++-v3/testsuite/26_numerics/valarray/range_access.cc
index eb8ca3e9dbb..2a929b537ed 100644
--- a/libstdc++-v3/testsuite/26_numerics/valarray/range_access.cc
+++ b/libstdc++-v3/testsuite/26_numerics/valarray/range_access.cc
@@ -28,4 +28,7 @@ test01()
   std::valarray<double> va{1.0, 2.0, 3.0};
   std::begin(va);
   std::end(va);
+  const auto& cva = va;
+  std::begin(cva);
+  std::end(cva);
 }
diff --git a/libstdc++-v3/testsuite/26_numerics/valarray/range_access.cc b/libstdc++-v3/testsuite/26_numerics/valarray/range_access2.cc
similarity index 79%
copy from libstdc++-v3/testsuite/26_numerics/valarray/range_access.cc
copy to libstdc++-v3/testsuite/26_numerics/valarray/range_access2.cc
index eb8ca3e9dbb..1c7a48581ba 100644
--- a/libstdc++-v3/testsuite/26_numerics/valarray/range_access.cc
+++ b/libstdc++-v3/testsuite/26_numerics/valarray/range_access2.cc
@@ -1,7 +1,7 @@
 // { dg-do compile }
-// { dg-options "-std=gnu++11" }
+// { dg-options "-std=gnu++14" }
 
-// Copyright (C) 2010-2015 Free Software Foundation, Inc.
+// Copyright (C) 2015 Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@@ -20,12 +20,17 @@
 
 // 26.6.10 valarray range access: [valarray.range]
 
+#include <iterator>
 #include <valarray>
 
+// PR libstdc++/67374
 void
 test01()
 {
   std::valarray<double> va{1.0, 2.0, 3.0};
-  std::begin(va);
-  std::end(va);
+  std::cbegin(va);
+  std::cend(va);
+  const auto& cva = va;
+  std::cbegin(cva);
+  std::cend(cva);
 }
-- 
2.11.4.GIT