diff options
Diffstat (limited to 'libcxx')
| -rw-r--r-- | libcxx/include/thread | 22 | ||||
| -rw-r--r-- | libcxx/include/type_traits | 6 | ||||
| -rw-r--r-- | libcxx/src/locale.cpp | 2 | ||||
| -rw-r--r-- | libcxx/src/support/win32/locale_win32.cpp | 8 | ||||
| -rw-r--r-- | libcxx/src/support/win32/support.cpp | 2 |
5 files changed, 20 insertions, 20 deletions
diff --git a/libcxx/include/thread b/libcxx/include/thread index 4366c41dbc2..4db4f61b981 100644 --- a/libcxx/include/thread +++ b/libcxx/include/thread @@ -137,40 +137,40 @@ template <class _Tp> void __thread_specific_ptr<_Tp>::__at_thread_exit(void* __p) { - delete static_cast<pointer>(__p); + delete static_cast<pointer>(__p); } template <class _Tp> __thread_specific_ptr<_Tp>::__thread_specific_ptr() { int __ec = pthread_key_create(&__key_, &__thread_specific_ptr::__at_thread_exit); - if (__ec) - throw system_error(error_code(__ec, system_category()), - "__thread_specific_ptr construction failed"); + if (__ec) + throw system_error(error_code(__ec, system_category()), + "__thread_specific_ptr construction failed"); } template <class _Tp> __thread_specific_ptr<_Tp>::~__thread_specific_ptr() { - pthread_key_delete(__key_); + pthread_key_delete(__key_); } template <class _Tp> typename __thread_specific_ptr<_Tp>::pointer __thread_specific_ptr<_Tp>::release() { - pointer __p = get(); - pthread_setspecific(__key_, 0); - return __p; + pointer __p = get(); + pthread_setspecific(__key_, 0); + return __p; } template <class _Tp> void __thread_specific_ptr<_Tp>::reset(pointer __p) { - pointer __p_old = get(); - pthread_setspecific(__key_, __p); - delete __p_old; + pointer __p_old = get(); + pthread_setspecific(__key_, __p); + delete __p_old; } class thread; diff --git a/libcxx/include/type_traits b/libcxx/include/type_traits index 95d3a3fcae8..90d56df3743 100644 --- a/libcxx/include/type_traits +++ b/libcxx/include/type_traits @@ -1277,9 +1277,9 @@ inline _LIBCPP_INLINE_VISIBILITY _Tp&& forward(typename std::remove_reference<_Tp>::type&& __t) _NOEXCEPT { - static_assert(!std::is_lvalue_reference<_Tp>::value, - "Can not forward an rvalue as an lvalue."); - return static_cast<_Tp&&>(__t); + static_assert(!std::is_lvalue_reference<_Tp>::value, + "Can not forward an rvalue as an lvalue."); + return static_cast<_Tp&&>(__t); } #else // _LIBCPP_HAS_NO_RVALUE_REFERENCES diff --git a/libcxx/src/locale.cpp b/libcxx/src/locale.cpp index c75a1542d9d..b90e163a02a 100644 --- a/libcxx/src/locale.cpp +++ b/libcxx/src/locale.cpp @@ -1032,7 +1032,7 @@ ctype_byname<wchar_t>::do_is(mask m, char_type c) const #ifdef _LIBCPP_WCTYPE_IS_MASK return static_cast<bool>(iswctype_l(c, m, __l)); #else - bool result = true; + bool result = true; if (m & space && !iswspace_l(c, __l)) result = false; if (m & print && !iswprint_l(c, __l)) result = false; if (m & cntrl && !iswcntrl_l(c, __l)) result = false; diff --git a/libcxx/src/support/win32/locale_win32.cpp b/libcxx/src/support/win32/locale_win32.cpp index 07cd392c21f..02b5874e294 100644 --- a/libcxx/src/support/win32/locale_win32.cpp +++ b/libcxx/src/support/win32/locale_win32.cpp @@ -22,10 +22,10 @@ locale_t uselocale( locale_t newloc ) locale_t old_locale = _get_current_locale(); // uselocale sets the thread's locale by definition, so unconditionally use thread-local locale _configthreadlocale( _ENABLE_PER_THREAD_LOCALE ); - // uselocale sets all categories - setlocale( LC_ALL, newloc->locinfo->lc_category[LC_ALL].locale ); - // uselocale returns the old locale_t - return old_locale; + // uselocale sets all categories + setlocale( LC_ALL, newloc->locinfo->lc_category[LC_ALL].locale ); + // uselocale returns the old locale_t + return old_locale; } lconv *localeconv_l( locale_t loc ) { diff --git a/libcxx/src/support/win32/support.cpp b/libcxx/src/support/win32/support.cpp index 8ed2921d241..b3ef50a7990 100644 --- a/libcxx/src/support/win32/support.cpp +++ b/libcxx/src/support/win32/support.cpp @@ -21,7 +21,7 @@ int asprintf(char **sptr, const char *__restrict__ fmt, ...) va_start(ap, fmt); int result = vasprintf(sptr, fmt, ap); va_end(ap); - return result; + return result; } int vasprintf( char **sptr, const char *__restrict__ fmt, va_list ap ) { |
