svn commit: r251193 - stable/9/contrib/libc++/include
Dimitry Andric
dim at FreeBSD.org
Fri May 31 20:11:08 UTC 2013
Author: dim
Date: Fri May 31 20:11:07 2013
New Revision: 251193
URL: http://svnweb.freebsd.org/changeset/base/251193
Log:
MFC r251066:
Fix warnings from newer clang versions about constexpr member functions
not being implicitly const in libc++'s <chrono> header. The warnings
have been introduced because of new language rules recently adopted by
the C++ WG. More info:
<http://www.open-std.org/JTC1/SC22/WG21/docs/papers/2013/n3598.html>
Modified:
stable/9/contrib/libc++/include/chrono
Directory Properties:
stable/9/contrib/libc++/ (props changed)
Modified: stable/9/contrib/libc++/include/chrono
==============================================================================
--- stable/9/contrib/libc++/include/chrono Fri May 31 20:07:26 2013 (r251192)
+++ stable/9/contrib/libc++/include/chrono Fri May 31 20:11:07 2013 (r251193)
@@ -468,7 +468,7 @@ template <class _LhsDuration, class _Rhs
struct __duration_eq
{
_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR
- bool operator()(const _LhsDuration& __lhs, const _RhsDuration& __rhs)
+ bool operator()(const _LhsDuration& __lhs, const _RhsDuration& __rhs) const
{
typedef typename common_type<_LhsDuration, _RhsDuration>::type _Ct;
return _Ct(__lhs).count() == _Ct(__rhs).count();
@@ -479,7 +479,7 @@ template <class _LhsDuration>
struct __duration_eq<_LhsDuration, _LhsDuration>
{
_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR
- bool operator()(const _LhsDuration& __lhs, const _LhsDuration& __rhs)
+ bool operator()(const _LhsDuration& __lhs, const _LhsDuration& __rhs) const
{return __lhs.count() == __rhs.count();}
};
@@ -509,7 +509,7 @@ template <class _LhsDuration, class _Rhs
struct __duration_lt
{
_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR
- bool operator()(const _LhsDuration& __lhs, const _RhsDuration& __rhs)
+ bool operator()(const _LhsDuration& __lhs, const _RhsDuration& __rhs) const
{
typedef typename common_type<_LhsDuration, _RhsDuration>::type _Ct;
return _Ct(__lhs).count() < _Ct(__rhs).count();
@@ -520,7 +520,7 @@ template <class _LhsDuration>
struct __duration_lt<_LhsDuration, _LhsDuration>
{
_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR
- bool operator()(const _LhsDuration& __lhs, const _LhsDuration& __rhs)
+ bool operator()(const _LhsDuration& __lhs, const _LhsDuration& __rhs) const
{return __lhs.count() < __rhs.count();}
};
More information about the svn-src-stable-9
mailing list