diff options
Diffstat (limited to 'libcxx/include')
| -rw-r--r-- | libcxx/include/forward_list | 2 | ||||
| -rw-r--r-- | libcxx/include/type_traits | 22 |
2 files changed, 12 insertions, 12 deletions
diff --git a/libcxx/include/forward_list b/libcxx/include/forward_list index a83b19520e2..f48f41bceab 100644 --- a/libcxx/include/forward_list +++ b/libcxx/include/forward_list @@ -1430,7 +1430,7 @@ forward_list<_Tp, _Alloc>::remove(const value_type& __v) iterator __j = _VSTD::next(__i, 2); for (; __j != __e && *__j == __v; ++__j) ; - __deleted_nodes.splice_after(__deleted_nodes.before_begin(), *this, __i, __j); + __deleted_nodes.splice_after(__deleted_nodes.before_begin(), *this, __i, __j); if (__j == __e) break; __i = __j; diff --git a/libcxx/include/type_traits b/libcxx/include/type_traits index 99cc7e1ebaf..b359710e827 100644 --- a/libcxx/include/type_traits +++ b/libcxx/include/type_traits @@ -1543,11 +1543,11 @@ template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY is_move_assignable // is_destructible -// if it's a reference, return true -// if it's a function, return false -// if it's void, return false -// if it's an array of unknown bound, return false -// Otherwise, return "std::declval<_Up&>().~_Up()" is well-formed +// if it's a reference, return true +// if it's a function, return false +// if it's void, return false +// if it's an array of unknown bound, return false +// Otherwise, return "std::declval<_Up&>().~_Up()" is well-formed // where _Up is remove_all_extents<_Tp>::type template <class> @@ -1555,15 +1555,15 @@ struct __is_destructible_apply { typedef int type; }; template <typename _Tp> struct __is_destructor_wellformed { - template <typename _Tp1> - static char __test ( + template <typename _Tp1> + static char __test ( typename __is_destructible_apply<decltype(_VSTD::declval<_Tp1&>().~_Tp1())>::type ); - template <typename _Tp1> - static __two __test (...); - - static const bool value = sizeof(__test<_Tp>(12)) == sizeof(char); + template <typename _Tp1> + static __two __test (...); + + static const bool value = sizeof(__test<_Tp>(12)) == sizeof(char); }; template <class _Tp, bool> |
