summaryrefslogtreecommitdiffstats
path: root/contrib/libc++
diff options
context:
space:
mode:
authordim <dim@FreeBSD.org>2013-05-28 20:11:28 +0000
committerdim <dim@FreeBSD.org>2013-05-28 20:11:28 +0000
commit43f25c391932a1b4446006169ad2d9f99252956a (patch)
tree2a9f813d93faf31cabfd208be49073ea4ac11980 /contrib/libc++
parent3d6f59397cf8ef71ef502c8367d7ea4206264f3a (diff)
downloadFreeBSD-src-43f25c391932a1b4446006169ad2d9f99252956a.zip
FreeBSD-src-43f25c391932a1b4446006169ad2d9f99252956a.tar.gz
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> MFC after: 3 days
Diffstat (limited to 'contrib/libc++')
-rw-r--r--contrib/libc++/include/chrono8
1 files changed, 4 insertions, 4 deletions
diff --git a/contrib/libc++/include/chrono b/contrib/libc++/include/chrono
index 3b96e816..4ceb875 100644
--- a/contrib/libc++/include/chrono
+++ b/contrib/libc++/include/chrono
@@ -468,7 +468,7 @@ template <class _LhsDuration, class _RhsDuration>
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 _RhsDuration>
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();}
};
OpenPOWER on IntegriCloud