From fa40983341e1d35fa2bebbb67f6474d8f3939215 Mon Sep 17 00:00:00 2001
From: Ed Smith-Rowland <3dw4rd@verizon.net>
Date: Sat, 1 Jun 2013 21:39:50 +0000
Subject: [PATCH] include/std/chrono: Collapse redundant 'inline' from 'inline
 constexpr'.

2013-06-01  Ed Smith-Rowland  <3dw4rd@verizon.net>

	include/std/chrono: Collapse redundant 'inline' from 'inline constexpr'.
	include/std/tuple: Ditto.
	include/bits/move.h: Ditto.

From-SVN: r199587
---
 libstdc++-v3/ChangeLog           |  6 ++++++
 libstdc++-v3/include/bits/move.h |  2 +-
 libstdc++-v3/include/std/chrono  | 24 ++++++++++++------------
 libstdc++-v3/include/std/tuple   |  8 ++++----
 4 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 2ec47f74224..2350efe1257 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,9 @@
+2013-06-01  Ed Smith-Rowland  <3dw4rd@verizon.net>
+
+	include/std/chrono: Collapse redundant 'inline' from 'inline constexpr'.
+	include/std/tuple: Ditto.
+	include/bits/move.h: Ditto.
+
 2013-05-30  Ed Smith-Rowland  <3dw4rd@verizon.net>
 
 	Implement N3642 - User-defined Literals for Standard Library Types
diff --git a/libstdc++-v3/include/bits/move.h b/libstdc++-v3/include/bits/move.h
index fb6c61fcc0a..d54edcd4168 100644
--- a/libstdc++-v3/include/bits/move.h
+++ b/libstdc++-v3/include/bits/move.h
@@ -116,7 +116,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
    *  type is copyable, in which case an lvalue-reference is returned instead.
    */
   template<typename _Tp>
-    inline constexpr typename
+    constexpr typename
     conditional<__move_if_noexcept_cond<_Tp>::value, const _Tp&, _Tp&&>::type
     move_if_noexcept(_Tp& __x) noexcept
     { return std::move(__x); }
diff --git a/libstdc++-v3/include/std/chrono b/libstdc++-v3/include/std/chrono
index f4c4ef017e6..7a574a62894 100644
--- a/libstdc++-v3/include/std/chrono
+++ b/libstdc++-v3/include/std/chrono
@@ -819,12 +819,12 @@ inline namespace chrono_literals {
 
   } // __detail
 
-  inline constexpr chrono::duration<long double, ratio<3600,1>>
+  constexpr chrono::duration<long double, ratio<3600,1>>
   operator"" h(long double __hours)
   { return chrono::duration<long double, ratio<3600,1>>{__hours}; }
 
   template <char... _Digits>
-    inline constexpr typename
+    constexpr typename
     __detail::_Select_type<__select_int::_Select_int<_Digits...>::value,
 			   chrono::hours>::type
     operator"" h()
@@ -834,12 +834,12 @@ inline namespace chrono_literals {
 			chrono::hours>::value;
     }
 
-  inline constexpr chrono::duration<long double, ratio<60,1>>
+  constexpr chrono::duration<long double, ratio<60,1>>
   operator"" min(long double __mins)
   { return chrono::duration<long double, ratio<60,1>>{__mins}; }
 
   template <char... _Digits>
-    inline constexpr typename
+    constexpr typename
     __detail::_Select_type<__select_int::_Select_int<_Digits...>::value,
 			   chrono::minutes>::type
     operator"" min()
@@ -849,12 +849,12 @@ inline namespace chrono_literals {
 			chrono::minutes>::value;
     }
 
-  inline constexpr chrono::duration<long double>
+  constexpr chrono::duration<long double>
   operator"" s(long double __secs)
   { return chrono::duration<long double>{__secs}; }
 
   template <char... _Digits>
-    inline constexpr typename
+    constexpr typename
     __detail::_Select_type<__select_int::_Select_int<_Digits...>::value,
 			   chrono::seconds>::type
     operator"" s()
@@ -864,12 +864,12 @@ inline namespace chrono_literals {
 			chrono::seconds>::value;
     }
 
-  inline constexpr chrono::duration<long double, milli>
+  constexpr chrono::duration<long double, milli>
   operator"" ms(long double __msecs)
   { return chrono::duration<long double, milli>{__msecs}; }
 
   template <char... _Digits>
-    inline constexpr typename
+    constexpr typename
     __detail::_Select_type<__select_int::_Select_int<_Digits...>::value,
 			   chrono::milliseconds>::type
     operator"" ms()
@@ -879,12 +879,12 @@ inline namespace chrono_literals {
 			chrono::milliseconds>::value;
     }
 
-  inline constexpr chrono::duration<long double, micro>
+  constexpr chrono::duration<long double, micro>
   operator"" us(long double __usecs)
   { return chrono::duration<long double, micro>{__usecs}; }
 
   template <char... _Digits>
-    inline constexpr typename
+    constexpr typename
     __detail::_Select_type<__select_int::_Select_int<_Digits...>::value,
 			   chrono::microseconds>::type
     operator"" us()
@@ -894,12 +894,12 @@ inline namespace chrono_literals {
 			chrono::microseconds>::value;
     }
 
-  inline constexpr chrono::duration<long double, nano>
+  constexpr chrono::duration<long double, nano>
   operator"" ns(long double __nsecs)
   { return chrono::duration<long double, nano>{__nsecs}; }
 
   template <char... _Digits>
-    inline constexpr typename
+    constexpr typename
     __detail::_Select_type<__select_int::_Select_int<_Digits...>::value,
 			   chrono::nanoseconds>::type
     operator"" ns()
diff --git a/libstdc++-v3/include/std/tuple b/libstdc++-v3/include/std/tuple
index 69f5bd1f72f..063ce02e9c7 100644
--- a/libstdc++-v3/include/std/tuple
+++ b/libstdc++-v3/include/std/tuple
@@ -856,25 +856,25 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
     }
 
   template<typename... _TElements, typename... _UElements>
-    inline constexpr bool
+    constexpr bool
     operator!=(const tuple<_TElements...>& __t,
 	       const tuple<_UElements...>& __u)
     { return !(__t == __u); }
 
   template<typename... _TElements, typename... _UElements>
-    inline constexpr bool
+    constexpr bool
     operator>(const tuple<_TElements...>& __t,
 	      const tuple<_UElements...>& __u)
     { return __u < __t; }
 
   template<typename... _TElements, typename... _UElements>
-    inline constexpr bool
+    constexpr bool
     operator<=(const tuple<_TElements...>& __t,
 	       const tuple<_UElements...>& __u)
     { return !(__u < __t); }
 
   template<typename... _TElements, typename... _UElements>
-    inline constexpr bool
+    constexpr bool
     operator>=(const tuple<_TElements...>& __t,
 	       const tuple<_UElements...>& __u)
     { return !(__t < __u); }