From: Jason Merrill <jason@redhat.com>
Date: Sun, 10 May 2015 00:46:12 +0000 (-0400)
Subject: synopsis.cc: Add _GLIBCXX14_CONSTEXPR.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=839473d010e6a62814f18155cd50c9e13ae3b6d6;p=gcc.git

synopsis.cc: Add _GLIBCXX14_CONSTEXPR.

	* testsuite/20_util/headers/functional/synopsis.cc: Add
	_GLIBCXX14_CONSTEXPR.
	* testsuite/25_algorithms/headers/algorithm/synopsis.cc: Likewise.

From-SVN: r222975
---

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 915df753ef0..d9ada80d26c 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,9 @@
+2015-05-09  Jason Merrill  <jason@redhat.com>
+
+	* testsuite/20_util/headers/functional/synopsis.cc: Add
+	_GLIBCXX14_CONSTEXPR.
+	* testsuite/25_algorithms/headers/algorithm/synopsis.cc: Likewise.
+
 2015-05-08  Jason Merrill  <jason@redhat.com>
 
 	* testsuite/19_diagnostics/headers/system_error/std_c++0x_neg.cc: Add -std=c++98.
diff --git a/libstdc++-v3/testsuite/20_util/headers/functional/synopsis.cc b/libstdc++-v3/testsuite/20_util/headers/functional/synopsis.cc
index 03d37a639ab..5e561de8265 100644
--- a/libstdc++-v3/testsuite/20_util/headers/functional/synopsis.cc
+++ b/libstdc++-v3/testsuite/20_util/headers/functional/synopsis.cc
@@ -50,9 +50,11 @@ namespace std {
   //  lib.negators, negators:
   template <class Predicate> struct unary_negate;
   template <class Predicate>
+  _GLIBCXX14_CONSTEXPR
   unary_negate<Predicate>  not1(const Predicate&);
   template <class Predicate> struct binary_negate;
   template <class Predicate>
+  _GLIBCXX14_CONSTEXPR
   binary_negate<Predicate> not2(const Predicate&);
 
   //  lib.binders, binders:
diff --git a/libstdc++-v3/testsuite/25_algorithms/headers/algorithm/synopsis.cc b/libstdc++-v3/testsuite/25_algorithms/headers/algorithm/synopsis.cc
index ba38f25cba8..47587965f72 100644
--- a/libstdc++-v3/testsuite/25_algorithms/headers/algorithm/synopsis.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/headers/algorithm/synopsis.cc
@@ -483,75 +483,93 @@ namespace std
 
   // 25.3.7, minimum and maximum:
   template<typename _Tp> 
+    _GLIBCXX14_CONSTEXPR
     const _Tp& 
     min(const _Tp&, const _Tp&);
 
   template<typename _Tp, typename _Compare>
+    _GLIBCXX14_CONSTEXPR
     const _Tp& 
     min(const _Tp&, const _Tp&, _Compare);
 
   template<typename _Tp> 
+    _GLIBCXX14_CONSTEXPR
     const _Tp& 
     max(const _Tp&, const _Tp&);
 
   template<typename _Tp, typename _Compare>
+    _GLIBCXX14_CONSTEXPR
     const _Tp& 
     max(const _Tp&, const _Tp&, _Compare);
 
   template<typename _FIter>
+    _GLIBCXX14_CONSTEXPR
     _FIter 
     min_element(_FIter, _FIter);
 
   template<typename _FIter, typename _Compare>
+    _GLIBCXX14_CONSTEXPR
     _FIter 
     min_element(_FIter, _FIter, _Compare);
 
   template<typename _FIter>
+    _GLIBCXX14_CONSTEXPR
     _FIter 
     max_element(_FIter, _FIter);
 
   template<typename _FIter, typename _Compare>
+    _GLIBCXX14_CONSTEXPR
     _FIter 
     max_element(_FIter, _FIter, _Compare);
 
 #if __cplusplus >= 201103L
   template<typename _Tp>
+    _GLIBCXX14_CONSTEXPR
     pair<const _Tp&, const _Tp&>
     minmax(const _Tp&, const _Tp&);
 
   template<typename _Tp, typename _Compare>
+    _GLIBCXX14_CONSTEXPR
     pair<const _Tp&, const _Tp&>
     minmax(const _Tp&, const _Tp&, _Compare);
 
   template<typename _FIter>
+    _GLIBCXX14_CONSTEXPR
     pair<_FIter, _FIter>
     minmax_element(_FIter, _FIter);
 
   template<typename _FIter, typename _Compare>
+    _GLIBCXX14_CONSTEXPR
     pair<_FIter, _FIter>
     minmax_element(_FIter, _FIter, _Compare);
 
   template<typename _Tp>
+    _GLIBCXX14_CONSTEXPR
     _Tp
     min(initializer_list<_Tp>);
 
   template<typename _Tp, typename _Compare>
+    _GLIBCXX14_CONSTEXPR
     _Tp
     min(initializer_list<_Tp>, _Compare);
 
   template<typename _Tp>
+    _GLIBCXX14_CONSTEXPR
     _Tp
     max(initializer_list<_Tp>);
 
   template<typename _Tp, typename _Compare>
+    _GLIBCXX14_CONSTEXPR
     _Tp
     max(initializer_list<_Tp>, _Compare);
 
   template<typename _Tp>
+    _GLIBCXX14_CONSTEXPR
     pair<_Tp, _Tp>
     minmax(initializer_list<_Tp>);
 
   template<typename _Tp, typename _Compare>
+    _GLIBCXX14_CONSTEXPR
     pair<_Tp, _Tp>
     minmax(initializer_list<_Tp>, _Compare);
 #endif