From 32eaac9c919b4b907d685370ef23aacc1e94f18b Mon Sep 17 00:00:00 2001
From: Jonathan Wakely <jwakely@redhat.com>
Date: Wed, 3 Aug 2016 19:11:23 +0100
Subject: [PATCH] Define std::as_const

	* include/std/utility (as_const): Define.
	* testsuite/20_util/as_const/1.cc: New test.
	* testsuite/20_util/as_const/rvalue_neg.cc: New test.

From-SVN: r239090
---
 libstdc++-v3/ChangeLog                        |  4 +++
 libstdc++-v3/include/std/utility              |  7 +++++
 libstdc++-v3/testsuite/20_util/as_const/1.cc  | 30 +++++++++++++++++++
 .../testsuite/20_util/as_const/rvalue_neg.cc  | 28 +++++++++++++++++
 4 files changed, 69 insertions(+)
 create mode 100644 libstdc++-v3/testsuite/20_util/as_const/1.cc
 create mode 100644 libstdc++-v3/testsuite/20_util/as_const/rvalue_neg.cc

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 8bc5b2e7176..bec650b78a9 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,9 @@
 2016-08-03  Jonathan Wakely  <jwakely@redhat.com>
 
+	* include/std/utility (as_const): Define.
+	* testsuite/20_util/as_const/1.cc: New test.
+	* testsuite/20_util/as_const/rvalue_neg.cc: New test.
+
 	* include/bits/shared_ptr.h (owner_less): Add default template
 	argument.
 	* include/bits/shared_ptr_base.h (_Sp_owner_less<void, void>): Define
diff --git a/libstdc++-v3/include/std/utility b/libstdc++-v3/include/std/utility
index 106ba4dfcf3..0c0364430b6 100644
--- a/libstdc++-v3/include/std/utility
+++ b/libstdc++-v3/include/std/utility
@@ -356,6 +356,13 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
   template <size_t _Idx>
     in_place_tag in_place(__in_place_index<_Idx>*) {terminate();}
 
+#define  __cpp_lib_as_const 201510
+  template<typename _Tp>
+    constexpr add_const_t<_Tp>& as_const(_Tp& __t) noexcept { return __t; }
+
+  template<typename _Tp>
+    void as_const(const _Tp&&) = delete;
+
 #endif
 
 _GLIBCXX_END_NAMESPACE_VERSION
diff --git a/libstdc++-v3/testsuite/20_util/as_const/1.cc b/libstdc++-v3/testsuite/20_util/as_const/1.cc
new file mode 100644
index 00000000000..2f257b46ff0
--- /dev/null
+++ b/libstdc++-v3/testsuite/20_util/as_const/1.cc
@@ -0,0 +1,30 @@
+// Copyright (C) 2016 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++17" }
+// { dg-do compile }
+
+#include <utility>
+
+#if __cpp_lib_as_const != 201510
+# error "__cpp_lib_as_const != 201510"
+#endif
+
+int i;
+constexpr auto& ci = std::as_const(i);
+static_assert( &i == &ci );
+static_assert( std::is_same_v<decltype(std::as_const(i)), const int&> );
diff --git a/libstdc++-v3/testsuite/20_util/as_const/rvalue_neg.cc b/libstdc++-v3/testsuite/20_util/as_const/rvalue_neg.cc
new file mode 100644
index 00000000000..3fe9e1839da
--- /dev/null
+++ b/libstdc++-v3/testsuite/20_util/as_const/rvalue_neg.cc
@@ -0,0 +1,28 @@
+// Copyright (C) 2016 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++17" }
+// { dg-do compile }
+
+#include <utility>
+
+void test01()
+{
+  int i = 0;
+  std::as_const(std::move(i));	// { dg-error "deleted function" }
+  std::as_const(0);		// { dg-error "deleted function" }
+}
-- 
2.30.2