From 93411db8c7880db31a3d6d6922845bf03cd665cc Mon Sep 17 00:00:00 2001
From: Jonathan Wakely <jwakely@redhat.com>
Date: Mon, 3 Aug 2015 16:56:17 +0100
Subject: [PATCH] re PR libstdc++/67078 (FAIL: 24_iterators/container_access.cc
 (test for excess errors) on aarch64-none-elf)

	PR libstdc++/67078
	* include/bits/range_access.h (size, empty, data): Fix _N bad name.

From-SVN: r226515
---
 libstdc++-v3/ChangeLog                   |  5 +++++
 libstdc++-v3/include/bits/range_access.h | 14 +++++++-------
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 5f87dddaa6f..f7b1c6bb40e 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2015-08-03  Jonathan Wakely  <jwakely@redhat.com>
+
+	PR libstdc++/67078
+	* include/bits/range_access.h (size, empty, data): Fix _N bad name.
+
 2015-07-30  Jonathan Wakely  <jwakely@redhat.com>
 
 	* testsuite/experimental/filesystem/operations/current_path.cc: Use
diff --git a/libstdc++-v3/include/bits/range_access.h b/libstdc++-v3/include/bits/range_access.h
index 2a1059885d7..586d162bc8c 100644
--- a/libstdc++-v3/include/bits/range_access.h
+++ b/libstdc++-v3/include/bits/range_access.h
@@ -237,10 +237,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
    *  @brief  Return the size of an array.
    *  @param  __array  Array.
    */
-  template <typename _Tp, size_t _N>
+  template <typename _Tp, size_t _Nm>
     constexpr size_t
-    size(const _Tp (&/*__array*/)[_N]) noexcept
-    { return _N; }
+    size(const _Tp (&/*__array*/)[_Nm]) noexcept
+    { return _Nm; }
 
   /**
    *  @brief  Return whether a container is empty.
@@ -255,9 +255,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
    *  @brief  Return whether an array is empty (always false).
    *  @param  __array  Container.
    */
-  template <typename _Tp, size_t _N>
+  template <typename _Tp, size_t _Nm>
     constexpr bool
-    empty(const _Tp (&/*__array*/)[_N]) noexcept
+    empty(const _Tp (&/*__array*/)[_Nm]) noexcept
     { return false; }
 
   /**
@@ -291,9 +291,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
    *  @brief  Return the data pointer of an array.
    *  @param  __array  Array.
    */
-  template <typename _Tp, size_t _N>
+  template <typename _Tp, size_t _Nm>
     constexpr _Tp*
-    data(_Tp (&__array)[_N]) noexcept
+    data(_Tp (&__array)[_Nm]) noexcept
     { return __array; }
 
   /**
-- 
2.30.2