2010-11-08 Benjamin Kosnik <bkoz@redhat.com>

        * include/std/complex (operator==, !=): Mark constexpr.
        * testsuite/26_numerics/complex/comparison_operators/constexpr.cc: New.




git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@166439 138bc75d-0d04-0410-961f-82ee72b054a4

3 files changed, 50 insertions, 6 deletions

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index fa9f25e03c8..4a5d6305f44 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2010-11-08  Benjamin Kosnik  <bkoz@redhat.com>
+
+        * include/std/complex (operator==, !=): Mark constexpr.
+        * testsuite/26_numerics/complex/comparison_operators/constexpr.cc: New.
+
 2010-11-08  Paolo Carlini  <paolo.carlini@oracle.com>
 
 	* include/bits/stl_tree.h (_Rb_tree<>::_M_erase_aux): Add.
diff --git a/libstdc++-v3/include/std/complex b/libstdc++-v3/include/std/complex
index 46a198c7e92..ffdadc3757e 100644
--- a/libstdc++-v3/include/std/complex
+++ b/libstdc++-v3/include/std/complex
@@ -447,17 +447,17 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
   //@{
   ///  Return true if @a x is equal to @a y.
   template<typename _Tp>
-    inline bool
+    inline _GLIBCXX_CONSTEXPR bool
     operator==(const complex<_Tp>& __x, const complex<_Tp>& __y)
     { return __x.real() == __y.real() && __x.imag() == __y.imag(); }
 
   template<typename _Tp>
-    inline bool
+    inline _GLIBCXX_CONSTEXPR bool
     operator==(const complex<_Tp>& __x, const _Tp& __y)
     { return __x.real() == __y && __x.imag() == _Tp(); }
 
   template<typename _Tp>
-    inline bool
+    inline _GLIBCXX_CONSTEXPR bool
     operator==(const _Tp& __x, const complex<_Tp>& __y)
     { return __x == __y.real() && _Tp() == __y.imag(); }
   //@}
@@ -465,17 +465,17 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
   //@{
   ///  Return false if @a x is equal to @a y.
   template<typename _Tp>
-    inline bool
+    inline _GLIBCXX_CONSTEXPR bool
     operator!=(const complex<_Tp>& __x, const complex<_Tp>& __y)
     { return __x.real() != __y.real() || __x.imag() != __y.imag(); }
 
   template<typename _Tp>
-    inline bool
+    inline _GLIBCXX_CONSTEXPR bool
     operator!=(const complex<_Tp>& __x, const _Tp& __y)
     { return __x.real() != __y || __x.imag() != _Tp(); }
 
   template<typename _Tp>
-    inline bool
+    inline _GLIBCXX_CONSTEXPR bool
     operator!=(const _Tp& __x, const complex<_Tp>& __y)
     { return __x != __y.real() || _Tp() != __y.imag(); }
   //@}
diff --git a/libstdc++-v3/testsuite/26_numerics/complex/comparison_operators/constexpr.cc b/libstdc++-v3/testsuite/26_numerics/complex/comparison_operators/constexpr.cc
new file mode 100644
index 00000000000..85c3ab7b4aa
--- /dev/null
+++ b/libstdc++-v3/testsuite/26_numerics/complex/comparison_operators/constexpr.cc
@@ -0,0 +1,39 @@
+// { dg-do compile }
+// { dg-options "-std=gnu++0x" }
+
+// Copyright (C) 2010 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>
+#include <testsuite_common_types.h>
+
+int main()
+{
+  __gnu_test::constexpr_comparison_eq_ne test;
+  test.operator()<std::complex<float>>();
+  test.operator()<std::complex<float>, float>();
+  test.operator()<float,std::complex<float>>();
+
+  test.operator()<std::complex<double>>();
+  test.operator()<std::complex<double>, double>();
+  test.operator()<double,std::complex<double>>();
+
+  test.operator()<std::complex<long double>>();
+  test.operator()<std::complex<long double>, long double>();
+  test.operator()<long double,std::complex<long double>>();
+  return 0;
+}