Commit fa409833 by Ed Smith-Rowland Committed by Edward Smith-Rowland

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
parent c68a6e08
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> 2013-05-30 Ed Smith-Rowland <3dw4rd@verizon.net>
Implement N3642 - User-defined Literals for Standard Library Types Implement N3642 - User-defined Literals for Standard Library Types
......
...@@ -116,7 +116,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -116,7 +116,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
* type is copyable, in which case an lvalue-reference is returned instead. * type is copyable, in which case an lvalue-reference is returned instead.
*/ */
template<typename _Tp> template<typename _Tp>
inline constexpr typename constexpr typename
conditional<__move_if_noexcept_cond<_Tp>::value, const _Tp&, _Tp&&>::type conditional<__move_if_noexcept_cond<_Tp>::value, const _Tp&, _Tp&&>::type
move_if_noexcept(_Tp& __x) noexcept move_if_noexcept(_Tp& __x) noexcept
{ return std::move(__x); } { return std::move(__x); }
......
...@@ -819,12 +819,12 @@ inline namespace chrono_literals { ...@@ -819,12 +819,12 @@ inline namespace chrono_literals {
} // __detail } // __detail
inline constexpr chrono::duration<long double, ratio<3600,1>> constexpr chrono::duration<long double, ratio<3600,1>>
operator"" h(long double __hours) operator"" h(long double __hours)
{ return chrono::duration<long double, ratio<3600,1>>{__hours}; } { return chrono::duration<long double, ratio<3600,1>>{__hours}; }
template <char... _Digits> template <char... _Digits>
inline constexpr typename constexpr typename
__detail::_Select_type<__select_int::_Select_int<_Digits...>::value, __detail::_Select_type<__select_int::_Select_int<_Digits...>::value,
chrono::hours>::type chrono::hours>::type
operator"" h() operator"" h()
...@@ -834,12 +834,12 @@ inline namespace chrono_literals { ...@@ -834,12 +834,12 @@ inline namespace chrono_literals {
chrono::hours>::value; 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) operator"" min(long double __mins)
{ return chrono::duration<long double, ratio<60,1>>{__mins}; } { return chrono::duration<long double, ratio<60,1>>{__mins}; }
template <char... _Digits> template <char... _Digits>
inline constexpr typename constexpr typename
__detail::_Select_type<__select_int::_Select_int<_Digits...>::value, __detail::_Select_type<__select_int::_Select_int<_Digits...>::value,
chrono::minutes>::type chrono::minutes>::type
operator"" min() operator"" min()
...@@ -849,12 +849,12 @@ inline namespace chrono_literals { ...@@ -849,12 +849,12 @@ inline namespace chrono_literals {
chrono::minutes>::value; chrono::minutes>::value;
} }
inline constexpr chrono::duration<long double> constexpr chrono::duration<long double>
operator"" s(long double __secs) operator"" s(long double __secs)
{ return chrono::duration<long double>{__secs}; } { return chrono::duration<long double>{__secs}; }
template <char... _Digits> template <char... _Digits>
inline constexpr typename constexpr typename
__detail::_Select_type<__select_int::_Select_int<_Digits...>::value, __detail::_Select_type<__select_int::_Select_int<_Digits...>::value,
chrono::seconds>::type chrono::seconds>::type
operator"" s() operator"" s()
...@@ -864,12 +864,12 @@ inline namespace chrono_literals { ...@@ -864,12 +864,12 @@ inline namespace chrono_literals {
chrono::seconds>::value; chrono::seconds>::value;
} }
inline constexpr chrono::duration<long double, milli> constexpr chrono::duration<long double, milli>
operator"" ms(long double __msecs) operator"" ms(long double __msecs)
{ return chrono::duration<long double, milli>{__msecs}; } { return chrono::duration<long double, milli>{__msecs}; }
template <char... _Digits> template <char... _Digits>
inline constexpr typename constexpr typename
__detail::_Select_type<__select_int::_Select_int<_Digits...>::value, __detail::_Select_type<__select_int::_Select_int<_Digits...>::value,
chrono::milliseconds>::type chrono::milliseconds>::type
operator"" ms() operator"" ms()
...@@ -879,12 +879,12 @@ inline namespace chrono_literals { ...@@ -879,12 +879,12 @@ inline namespace chrono_literals {
chrono::milliseconds>::value; chrono::milliseconds>::value;
} }
inline constexpr chrono::duration<long double, micro> constexpr chrono::duration<long double, micro>
operator"" us(long double __usecs) operator"" us(long double __usecs)
{ return chrono::duration<long double, micro>{__usecs}; } { return chrono::duration<long double, micro>{__usecs}; }
template <char... _Digits> template <char... _Digits>
inline constexpr typename constexpr typename
__detail::_Select_type<__select_int::_Select_int<_Digits...>::value, __detail::_Select_type<__select_int::_Select_int<_Digits...>::value,
chrono::microseconds>::type chrono::microseconds>::type
operator"" us() operator"" us()
...@@ -894,12 +894,12 @@ inline namespace chrono_literals { ...@@ -894,12 +894,12 @@ inline namespace chrono_literals {
chrono::microseconds>::value; chrono::microseconds>::value;
} }
inline constexpr chrono::duration<long double, nano> constexpr chrono::duration<long double, nano>
operator"" ns(long double __nsecs) operator"" ns(long double __nsecs)
{ return chrono::duration<long double, nano>{__nsecs}; } { return chrono::duration<long double, nano>{__nsecs}; }
template <char... _Digits> template <char... _Digits>
inline constexpr typename constexpr typename
__detail::_Select_type<__select_int::_Select_int<_Digits...>::value, __detail::_Select_type<__select_int::_Select_int<_Digits...>::value,
chrono::nanoseconds>::type chrono::nanoseconds>::type
operator"" ns() operator"" ns()
......
...@@ -856,25 +856,25 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -856,25 +856,25 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
} }
template<typename... _TElements, typename... _UElements> template<typename... _TElements, typename... _UElements>
inline constexpr bool constexpr bool
operator!=(const tuple<_TElements...>& __t, operator!=(const tuple<_TElements...>& __t,
const tuple<_UElements...>& __u) const tuple<_UElements...>& __u)
{ return !(__t == __u); } { return !(__t == __u); }
template<typename... _TElements, typename... _UElements> template<typename... _TElements, typename... _UElements>
inline constexpr bool constexpr bool
operator>(const tuple<_TElements...>& __t, operator>(const tuple<_TElements...>& __t,
const tuple<_UElements...>& __u) const tuple<_UElements...>& __u)
{ return __u < __t; } { return __u < __t; }
template<typename... _TElements, typename... _UElements> template<typename... _TElements, typename... _UElements>
inline constexpr bool constexpr bool
operator<=(const tuple<_TElements...>& __t, operator<=(const tuple<_TElements...>& __t,
const tuple<_UElements...>& __u) const tuple<_UElements...>& __u)
{ return !(__u < __t); } { return !(__u < __t); }
template<typename... _TElements, typename... _UElements> template<typename... _TElements, typename... _UElements>
inline constexpr bool constexpr bool
operator>=(const tuple<_TElements...>& __t, operator>=(const tuple<_TElements...>& __t,
const tuple<_UElements...>& __u) const tuple<_UElements...>& __u)
{ return !(__t < __u); } { return !(__t < __u); }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment