From 327a79a52392f9fec4c92693278fe8d362bc7008 Mon Sep 17 00:00:00 2001
From: Jonathan Wakely <jwakely@redhat.com>
Date: Wed, 15 Oct 2014 14:20:12 +0100
Subject: [PATCH] complex (complex::real, [...]): Add const.

	* include/std/complex (complex::real, complex::imag): Add const.
	* testsuite/26_numerics/complex/value_operations/constexpr2.cc: New.

From-SVN: r216258
---
 libstdc++-v3/ChangeLog                        |  5 ++++
 libstdc++-v3/include/std/complex              |  4 +--
 .../complex/value_operations/constexpr2.cc    | 28 +++++++++++++++++++
 3 files changed, 35 insertions(+), 2 deletions(-)
 create mode 100644 libstdc++-v3/testsuite/26_numerics/complex/value_operations/constexpr2.cc

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 9fcaaef09bc..28767d25846 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2014-10-15  Jonathan Wakely  <jwakely@redhat.com>
+
+	* include/std/complex (complex::real, complex::imag): Add const.
+	* testsuite/26_numerics/complex/value_operations/constexpr2.cc: New.
+
 2014-10-15  Paolo Carlini  <paolo.carlini@oracle.com>
 
 	* include/std/limits: Remove stray semicolon.
diff --git a/libstdc++-v3/include/std/complex b/libstdc++-v3/include/std/complex
index bf302c18672..6670ed71997 100644
--- a/libstdc++-v3/include/std/complex
+++ b/libstdc++-v3/include/std/complex
@@ -144,11 +144,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
       // DR 387. std::complex over-encapsulated.
       _GLIBCXX_ABI_TAG_CXX11
       constexpr _Tp 
-      real() { return _M_real; }
+      real() const { return _M_real; }
 
       _GLIBCXX_ABI_TAG_CXX11
       constexpr _Tp 
-      imag() { return _M_imag; }
+      imag() const { return _M_imag; }
 #else
       ///  Return real part of complex number.
       _Tp& 
diff --git a/libstdc++-v3/testsuite/26_numerics/complex/value_operations/constexpr2.cc b/libstdc++-v3/testsuite/26_numerics/complex/value_operations/constexpr2.cc
new file mode 100644
index 00000000000..e85e211fa72
--- /dev/null
+++ b/libstdc++-v3/testsuite/26_numerics/complex/value_operations/constexpr2.cc
@@ -0,0 +1,28 @@
+// { dg-do compile }
+// { dg-options "-std=gnu++14" }
+
+// Copyright (C) 2014 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/>.
+
+#include <complex>
+
+int main()
+{
+  constexpr std::complex<int> c{};
+  constexpr auto r __attribute__((unused)) = real(c);
+  constexpr auto i __attribute__((unused)) = imag(c);
+}
-- 
2.30.2