From: Jonathan Wakely <jwakely@redhat.com>
Date: Wed, 13 May 2015 13:54:46 +0000 (+0100)
Subject: stl_raw_storage_iter.h (raw_storage_iterator::base()): Define (LWG 2454).
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=49d50b6b8f727b681410a1865aadd915a14df2a5;p=gcc.git

stl_raw_storage_iter.h (raw_storage_iterator::base()): Define (LWG 2454).

	* include/bits/stl_raw_storage_iter.h (raw_storage_iterator::base()):
	Define (LWG 2454).
	* testsuite/20_util/raw_storage_iterator/base.cc: New.

From-SVN: r223162
---

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 34bda015a1e..965cdccaa05 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,9 @@
 2015-05-13  Jonathan Wakely  <jwakely@redhat.com>
 
+	* include/bits/stl_raw_storage_iter.h (raw_storage_iterator::base()):
+	Define (LWG 2454).
+	* testsuite/20_util/raw_storage_iterator/base.cc: New.
+
 	* include/std/future (packaged_task(allocator_arg_t, const A&, F&&):
 	Remove explicit (LWG 2407).
 
diff --git a/libstdc++-v3/include/bits/stl_raw_storage_iter.h b/libstdc++-v3/include/bits/stl_raw_storage_iter.h
index 2ce83ff0ef8..fc9019c1341 100644
--- a/libstdc++-v3/include/bits/stl_raw_storage_iter.h
+++ b/libstdc++-v3/include/bits/stl_raw_storage_iter.h
@@ -100,6 +100,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
 	++_M_iter;
 	return __tmp;
       }
+
+      // _GLIBCXX_RESOLVE_LIB_DEFECTS
+      // 2454. Add raw_storage_iterator::base() member
+      _OutputIterator base() const { return _M_iter; }
     };
 
 _GLIBCXX_END_NAMESPACE_VERSION
diff --git a/libstdc++-v3/testsuite/20_util/raw_storage_iterator/base.cc b/libstdc++-v3/testsuite/20_util/raw_storage_iterator/base.cc
new file mode 100644
index 00000000000..f6429bd0591
--- /dev/null
+++ b/libstdc++-v3/testsuite/20_util/raw_storage_iterator/base.cc
@@ -0,0 +1,36 @@
+// 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
+// terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 3, or (at your option)
+// any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License along
+// with this library; see the file COPYING3.  If not see
+// <http://www.gnu.org/licenses/>.
+
+// { dg-options "-std=gnu++11" }
+
+#include <memory>
+#include <testsuite_hooks.h>
+
+void
+test01()
+{
+  int a[2];
+  auto it = std::raw_storage_iterator<int*, int>(a);
+  VERIFY( it.base() == a );
+  VERIFY( (++it).base() == a+1 );
+}
+
+int
+main()
+{
+  test01();
+}