[NFC] Strip trailing whitespace from libc++

12 files changed, 74 insertions, 74 deletions

diff --git a/libcxx/include/__string b/libcxx/include/__string
index b4c8815f72d2..70fd1cc3930d 100644
--- a/libcxx/include/__string
+++ b/libcxx/include/__string
@@ -31,7 +31,7 @@ struct char_traits
 
     static constexpr int    compare(const char_type* s1, const char_type* s2, size_t n);
     static constexpr size_t length(const char_type* s);
-    static constexpr const char_type* 
+    static constexpr const char_type*
                             find(const char_type* s, size_t n, const char_type& a);
     static char_type*       move(char_type* s1, const char_type* s2, size_t n);
     static char_type*       copy(char_type* s1, const char_type* s2, size_t n);
@@ -424,19 +424,19 @@ struct _LIBCPP_TEMPLATE_VIS char_traits<char8_t>
 
     static constexpr
     size_t           length(const char_type* __s) _NOEXCEPT;
- 
+
     _LIBCPP_INLINE_VISIBILITY static constexpr
     const char_type* find(const char_type* __s, size_t __n, const char_type& __a) _NOEXCEPT;
- 
+
     static char_type*       move(char_type* __s1, const char_type* __s2, size_t __n) _NOEXCEPT
         {return __n == 0 ? __s1 : (char_type*) memmove(__s1, __s2, __n);}
- 
+
     static char_type*       copy(char_type* __s1, const char_type* __s2, size_t __n) _NOEXCEPT
        {
             _LIBCPP_ASSERT(__s2 < __s1 || __s2 >= __s1+__n, "char_traits::copy overlapped range");
             return __n == 0 ? __s1 : (char_type*)memcpy(__s1, __s2, __n);
        }
- 
+
     static char_type*       assign(char_type* __s, size_t __n, char_type __a) _NOEXCEPT
         {return __n == 0 ? __s : (char_type*)memset(__s, to_int_type(__a), __n);}
 
@@ -744,7 +744,7 @@ char_traits<char32_t>::assign(char_type* __s, size_t __n, char_type __a) _NOEXCE
 // __str_find
 template<class _CharT, class _SizeT, class _Traits, _SizeT __npos>
 inline _SizeT _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-__str_find(const _CharT *__p, _SizeT __sz, 
+__str_find(const _CharT *__p, _SizeT __sz,
              _CharT __c, _SizeT __pos) _NOEXCEPT
 {
     if (__pos >= __sz)
@@ -796,7 +796,7 @@ __search_substring(const _CharT *__first1, const _CharT *__last1,
 
 template<class _CharT, class _SizeT, class _Traits, _SizeT __npos>
 inline _SizeT _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-__str_find(const _CharT *__p, _SizeT __sz, 
+__str_find(const _CharT *__p, _SizeT __sz,
        const _CharT* __s, _SizeT __pos, _SizeT __n) _NOEXCEPT
 {
     if (__pos > __sz)
@@ -818,7 +818,7 @@ __str_find(const _CharT *__p, _SizeT __sz,
 
 template<class _CharT, class _SizeT, class _Traits, _SizeT __npos>
 inline _SizeT _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-__str_rfind(const _CharT *__p, _SizeT __sz, 
+__str_rfind(const _CharT *__p, _SizeT __sz,
               _CharT __c, _SizeT __pos) _NOEXCEPT
 {
     if (__sz < 1)
@@ -837,7 +837,7 @@ __str_rfind(const _CharT *__p, _SizeT __sz,
 
 template<class _CharT, class _SizeT, class _Traits, _SizeT __npos>
 inline _SizeT _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-__str_rfind(const _CharT *__p, _SizeT __sz, 
+__str_rfind(const _CharT *__p, _SizeT __sz,
         const _CharT* __s, _SizeT __pos, _SizeT __n) _NOEXCEPT
 {
     __pos = _VSTD::min(__pos, __sz);
@@ -846,7 +846,7 @@ __str_rfind(const _CharT *__p, _SizeT __sz,
     else
         __pos = __sz;
     const _CharT* __r = _VSTD::__find_end(
-                  __p, __p + __pos, __s, __s + __n, _Traits::eq, 
+                  __p, __p + __pos, __s, __s + __n, _Traits::eq,
                         random_access_iterator_tag(), random_access_iterator_tag());
     if (__n > 0 && __r == __p + __pos)
         return __npos;
@@ -975,7 +975,7 @@ struct __quoted_output_proxy
 
     __quoted_output_proxy(_Iter __f, _Iter __l, _CharT __d, _CharT __e)
     : __first(__f), __last(__l), __delim(__d), __escape(__e) {}
-    //  This would be a nice place for a string_ref 
+    //  This would be a nice place for a string_ref
 };
 
 _LIBCPP_END_NAMESPACE_STD
diff --git a/libcxx/include/__threading_support b/libcxx/include/__threading_support
index 0d1f1e681f50..50cec7e0c95a 100644
--- a/libcxx/include/__threading_support
+++ b/libcxx/include/__threading_support
@@ -453,7 +453,7 @@ public:
 
     _LIBCPP_INLINE_VISIBILITY
     void __reset() { __id_ = 0; }
-    
+
     template<class _CharT, class _Traits>
     friend
     _LIBCPP_INLINE_VISIBILITY
diff --git a/libcxx/include/bit b/libcxx/include/bit
index 8800b22b7bcb..6dc85b5d01fb 100644
--- a/libcxx/include/bit
+++ b/libcxx/include/bit
@@ -42,7 +42,7 @@ namespace std {
   template<class T>
     constexpr int popcount(T x) noexcept;     // C++20
 
-  // 20.15.9, endian 
+  // 20.15.9, endian
   enum class endian {
     little = see below,        // C++20
     big = see below,           // C++20
@@ -350,7 +350,7 @@ _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR
 bool __ispow2(_Tp __t) _NOEXCEPT
 {
     static_assert(__bitop_unsigned_integer<_Tp>::value, "__ispow2 requires unsigned");
-	return __t != 0 && (((__t & (__t - 1)) == 0)); 
+	return __t != 0 && (((__t & (__t - 1)) == 0));
 }
 
 
diff --git a/libcxx/include/ctime b/libcxx/include/ctime
index cb8474f8f0b5..71e60b10fe55 100644
--- a/libcxx/include/ctime
+++ b/libcxx/include/ctime
@@ -18,7 +18,7 @@ Macros:
     NULL
     CLOCKS_PER_SEC
     TIME_UTC // C++17
-    
+
 namespace std
 {
 
@@ -29,7 +29,7 @@ Types:
     time_t
     tm
     timespec // C++17
-    
+
 clock_t clock();
 double difftime(time_t time1, time_t time0);
 time_t mktime(tm* timeptr);
diff --git a/libcxx/include/experimental/functional b/libcxx/include/experimental/functional
index 755eda641556..c7dda2254b39 100644
--- a/libcxx/include/experimental/functional
+++ b/libcxx/include/experimental/functional
@@ -112,7 +112,7 @@ template<class _ForwardIterator, class _BinaryPredicate = equal_to<>>
 class _LIBCPP_TYPE_VIS default_searcher {
 public:
     _LIBCPP_INLINE_VISIBILITY
-    default_searcher(_ForwardIterator __f, _ForwardIterator __l, 
+    default_searcher(_ForwardIterator __f, _ForwardIterator __l,
                        _BinaryPredicate __p = _BinaryPredicate())
         : __first_(__f), __last_(__l), __pred_(__p) {}
 
@@ -151,12 +151,12 @@ public: // TODO private:
 
     const _Value __default_value_;
     std::unordered_map<_Key, _Value, _Hash, _BinaryPredicate> __table;
-    
+
 public:
     _LIBCPP_INLINE_VISIBILITY
     _BMSkipTable(std::size_t __sz, _Value __default, _Hash __hf, _BinaryPredicate __pred)
         : __default_value_(__default), __table(__sz, __hf, __pred) {}
-    
+
     _LIBCPP_INLINE_VISIBILITY
     void insert(const key_type &__key, value_type __val)
     {
@@ -170,7 +170,7 @@ public:
         return __it == __table.end() ? __default_value_ : __it->second;
     }
 };
-    
+
 
 //  Special case small numeric values; use an array
 template<class _Key, typename _Value, class _Hash, class _BinaryPredicate>
@@ -189,7 +189,7 @@ public:
     {
         std::fill_n(__table.begin(), __table.size(), __default);
     }
-    
+
     _LIBCPP_INLINE_VISIBILITY
     void insert(key_type __key, value_type __val)
     {
@@ -204,8 +204,8 @@ public:
 };
 
 
-template <class _RandomAccessIterator1, 
-          class _Hash = hash<typename iterator_traits<_RandomAccessIterator1>::value_type>, 
+template <class _RandomAccessIterator1,
+          class _Hash = hash<typename iterator_traits<_RandomAccessIterator1>::value_type>,
           class _BinaryPredicate = equal_to<>>
 class _LIBCPP_TYPE_VIS boyer_moore_searcher {
 private:
@@ -217,9 +217,9 @@ private:
                     is_same<_Hash, hash<value_type>>::value &&
                     is_same<_BinaryPredicate, equal_to<>>::value
             > skip_table_type;
-    
+
 public:
-    boyer_moore_searcher(_RandomAccessIterator1 __f, _RandomAccessIterator1 __l, 
+    boyer_moore_searcher(_RandomAccessIterator1 __f, _RandomAccessIterator1 __l,
                 _Hash __hf = _Hash(), _BinaryPredicate __pred = _BinaryPredicate())
             : __first_(__f), __last_(__l), __pred_(__pred),
               __pattern_length_(_VSTD::distance(__first_, __last_)),
@@ -232,13 +232,13 @@ public:
 
         this->__build_suffix_table ( __first_, __last_, __pred_ );
         }
-        
+
     template <typename _RandomAccessIterator2>
     pair<_RandomAccessIterator2, _RandomAccessIterator2>
     operator ()(_RandomAccessIterator2 __f, _RandomAccessIterator2 __l) const
     {
         static_assert ( std::is_same<
-                typename std::__uncvref<typename std::iterator_traits<_RandomAccessIterator1>::value_type>::type, 
+                typename std::__uncvref<typename std::iterator_traits<_RandomAccessIterator1>::value_type>::type,
                 typename std::__uncvref<typename std::iterator_traits<_RandomAccessIterator2>::value_type>::type
                     >::value,
                 "Corpus and Pattern iterators must point to the same type" );
@@ -247,13 +247,13 @@ public:
         if (__first_ == __last_) return make_pair(__f, __f); // empty pattern
 
     //  If the pattern is larger than the corpus, we can't find it!
-        if ( __pattern_length_ > _VSTD::distance (__f, __l)) 
+        if ( __pattern_length_ > _VSTD::distance (__f, __l))
             return make_pair(__l, __l);
 
-    //  Do the search 
+    //  Do the search
         return this->__search(__f, __l);
     }
-        
+
 public: // TODO private:
     _RandomAccessIterator1               __first_;
     _RandomAccessIterator1               __last_;
@@ -270,7 +270,7 @@ public: // TODO private:
         const _RandomAccessIterator2 __last = __l - __pattern_length_;
         const skip_table_type &         __skip   = *__skip_.get();
         const vector<difference_type> & __suffix = *__suffix_.get();
-        
+
         while (__cur <= __last)
         {
 
@@ -282,7 +282,7 @@ public: // TODO private:
                 if ( __j == 0 )
                     return make_pair(__cur, __cur + __pattern_length_);
                 }
-            
+
         //  Since we didn't match, figure out how far to skip forward
             difference_type __k = __skip[__cur [ __j - 1 ]];
             difference_type __m = __j - __k - 1;
@@ -291,7 +291,7 @@ public: // TODO private:
             else
                 __cur += __suffix[ __j ];
         }
-    
+
         return make_pair(__l, __l);     // We didn't find anything
     }
 
@@ -300,21 +300,21 @@ public: // TODO private:
     void __compute_bm_prefix ( _Iterator __f, _Iterator __l, _BinaryPredicate __pred, _Container &__prefix )
     {
         const std::size_t __count = _VSTD::distance(__f, __l);
-                        
+
         __prefix[0] = 0;
         std::size_t __k = 0;
         for ( std::size_t __i = 1; __i < __count; ++__i )
         {
             while ( __k > 0 && !__pred ( __f[__k], __f[__i] ))
                 __k = __prefix [ __k - 1 ];
-                
+
             if ( __pred ( __f[__k], __f[__i] ))
                 __k++;
             __prefix [ __i ] = __k;
         }
     }
 
-    void __build_suffix_table(_RandomAccessIterator1 __f, _RandomAccessIterator1 __l, 
+    void __build_suffix_table(_RandomAccessIterator1 __f, _RandomAccessIterator1 __l,
                                                     _BinaryPredicate __pred)
     {
         const std::size_t __count = _VSTD::distance(__f, __l);
@@ -322,19 +322,19 @@ public: // TODO private:
         if (__count > 0)
         {
             _VSTD::vector<value_type> __scratch(__count);
-            
+
             __compute_bm_prefix(__f, __l, __pred, __scratch);
             for ( std::size_t __i = 0; __i <= __count; __i++ )
                 __suffix[__i] = __count - __scratch[__count-1];
-    
+
             typedef _VSTD::reverse_iterator<_RandomAccessIterator1> _RevIter;
             __compute_bm_prefix(_RevIter(__l), _RevIter(__f), __pred, __scratch);
-     
+
             for ( std::size_t __i = 0; __i < __count; __i++ )
             {
                 const std::size_t     __j = __count - __scratch[__i];
                 const difference_type __k = __i     - __scratch[__i] + 1;
-     
+
                 if (__suffix[__j] > __k)
                     __suffix[__j] = __k;
             }
@@ -343,20 +343,20 @@ public: // TODO private:
 
 };
 
-template<class _RandomAccessIterator, 
-         class _Hash = hash<typename iterator_traits<_RandomAccessIterator>::value_type>, 
+template<class _RandomAccessIterator,
+         class _Hash = hash<typename iterator_traits<_RandomAccessIterator>::value_type>,
          class _BinaryPredicate = equal_to<>>
 _LIBCPP_INLINE_VISIBILITY
 boyer_moore_searcher<_RandomAccessIterator, _Hash, _BinaryPredicate>
-make_boyer_moore_searcher( _RandomAccessIterator __f, _RandomAccessIterator __l, 
+make_boyer_moore_searcher( _RandomAccessIterator __f, _RandomAccessIterator __l,
                     _Hash __hf = _Hash(), _BinaryPredicate __p = _BinaryPredicate ())
 {
     return boyer_moore_searcher<_RandomAccessIterator, _Hash, _BinaryPredicate>(__f, __l, __hf, __p);
 }
 
 // boyer-moore-horspool
-template <class _RandomAccessIterator1, 
-          class _Hash = hash<typename iterator_traits<_RandomAccessIterator1>::value_type>, 
+template <class _RandomAccessIterator1,
+          class _Hash = hash<typename iterator_traits<_RandomAccessIterator1>::value_type>,
           class _BinaryPredicate = equal_to<>>
 class _LIBCPP_TYPE_VIS boyer_moore_horspool_searcher {
 private:
@@ -370,7 +370,7 @@ private:
             > skip_table_type;
 
 public:
-    boyer_moore_horspool_searcher(_RandomAccessIterator1 __f, _RandomAccessIterator1 __l, 
+    boyer_moore_horspool_searcher(_RandomAccessIterator1 __f, _RandomAccessIterator1 __l,
                 _Hash __hf = _Hash(), _BinaryPredicate __pred = _BinaryPredicate())
             : __first_(__f), __last_(__l), __pred_(__pred),
               __pattern_length_(_VSTD::distance(__first_, __last_)),
@@ -384,13 +384,13 @@ public:
                     __skip_->insert(*__f, __pattern_length_ - 1 - __i);
             }
         }
-            
+
     template <typename _RandomAccessIterator2>
     pair<_RandomAccessIterator2, _RandomAccessIterator2>
     operator ()(_RandomAccessIterator2 __f, _RandomAccessIterator2 __l) const
     {
         static_assert ( std::is_same<
-                typename std::__uncvref<typename std::iterator_traits<_RandomAccessIterator1>::value_type>::type, 
+                typename std::__uncvref<typename std::iterator_traits<_RandomAccessIterator1>::value_type>::type,
                 typename std::__uncvref<typename std::iterator_traits<_RandomAccessIterator2>::value_type>::type
                     >::value,
                 "Corpus and Pattern iterators must point to the same type" );
@@ -399,13 +399,13 @@ public:
         if (__first_ == __last_) return make_pair(__f, __f); // empty pattern
 
     //  If the pattern is larger than the corpus, we can't find it!
-        if ( __pattern_length_ > _VSTD::distance (__f, __l)) 
+        if ( __pattern_length_ > _VSTD::distance (__f, __l))
             return make_pair(__l, __l);
 
-    //  Do the search 
+    //  Do the search
         return this->__search(__f, __l);
     }
-        
+
 private:
     _RandomAccessIterator1      __first_;
     _RandomAccessIterator1      __last_;
@@ -433,17 +433,17 @@ private:
             }
             __cur += __skip[__cur[__pattern_length_-1]];
         }
-        
+
         return make_pair(__l, __l);
     }
 };
 
-template<class _RandomAccessIterator, 
-         class _Hash = hash<typename iterator_traits<_RandomAccessIterator>::value_type>, 
+template<class _RandomAccessIterator,
+         class _Hash = hash<typename iterator_traits<_RandomAccessIterator>::value_type>,
          class _BinaryPredicate = equal_to<>>
 _LIBCPP_INLINE_VISIBILITY
 boyer_moore_horspool_searcher<_RandomAccessIterator, _Hash, _BinaryPredicate>
-make_boyer_moore_horspool_searcher( _RandomAccessIterator __f, _RandomAccessIterator __l, 
+make_boyer_moore_horspool_searcher( _RandomAccessIterator __f, _RandomAccessIterator __l,
                     _Hash __hf = _Hash(), _BinaryPredicate __p = _BinaryPredicate ())
 {
     return boyer_moore_horspool_searcher<_RandomAccessIterator, _Hash, _BinaryPredicate>(__f, __l, __hf, __p);
diff --git a/libcxx/include/experimental/iterator b/libcxx/include/experimental/iterator
index 6a6e51d820d1..10b0599138c6 100644
--- a/libcxx/include/experimental/iterator
+++ b/libcxx/include/experimental/iterator
@@ -26,19 +26,19 @@ namespace std {
          typedef void                         difference_type;
          typedef void                         pointer;
          typedef void                         reference;
-      
+
          ostream_joiner(ostream_type& s, const DelimT& delimiter);
          ostream_joiner(ostream_type& s, DelimT&& delimiter);
 
-         template<typename T>  
+         template<typename T>
          ostream_joiner& operator=(const T& value);
 
          ostream_joiner& operator*() noexcept;
          ostream_joiner& operator++() noexcept;
          ostream_joiner& operator++(int) noexcept;
    private:
-      ostream_type* out_stream;   // exposition only 
-      DelimT delim;               // exposition only 
+      ostream_type* out_stream;   // exposition only
+      DelimT delim;               // exposition only
       bool first_element;         // exposition only
    };
 
@@ -75,10 +75,10 @@ public:
 
     ostream_joiner(ostream_type& __os, _Delim&& __d)
         : __output_iter(_VSTD::addressof(__os)), __delim(_VSTD::move(__d)), __first(true) {}
-        
+
     ostream_joiner(ostream_type& __os, const _Delim& __d)
         : __output_iter(_VSTD::addressof(__os)), __delim(__d), __first(true) {}
-    
+
 
     template<typename _Tp>
     ostream_joiner& operator=(const _Tp& __v)
diff --git a/libcxx/include/experimental/type_traits b/libcxx/include/experimental/type_traits
index 19466e9a5a5d..7ab097226b5d 100644
--- a/libcxx/include/experimental/type_traits
+++ b/libcxx/include/experimental/type_traits
@@ -60,7 +60,7 @@ inline namespace fundamentals_v1 {
      using is_detected_convertible = is_convertible<detected_t<Op, Args...>, To>;
   template <class To, template<class...> class Op, class... Args>
      constexpr bool is_detected_convertible_v
-       = is_detected_convertible<To, Op, Args...>::value;  
+       = is_detected_convertible<To, Op, Args...>::value;
 
 } // namespace fundamentals_v1
 } // namespace experimental
@@ -122,7 +122,7 @@ struct _DETECTOR<_Default, void_t<_Op<_Args...>>, _Op, _Args...> {
    using value_t = true_type;
    using type = _Op<_Args...>;
    };
-     
+
 
 template <template<class...> class _Op, class... _Args>
   using is_detected = typename _DETECTOR<nonesuch, void, _Op, _Args...>::value_t;
@@ -144,7 +144,7 @@ template <class Expected, template<class...> class _Op, class... _Args>
 template <class To, template<class...> class _Op, class... _Args>
   using is_detected_convertible = is_convertible<detected_t<_Op, _Args...>, To>;
 template <class To, template<class...> class _Op, class... _Args>
-  _LIBCPP_CONSTEXPR bool is_detected_convertible_v = is_detected_convertible<To, _Op, _Args...>::value;  
+  _LIBCPP_CONSTEXPR bool is_detected_convertible_v = is_detected_convertible<To, _Op, _Args...>::value;
 
 
 _LIBCPP_END_NAMESPACE_LFTS
diff --git a/libcxx/include/ext/hash_map b/libcxx/include/ext/hash_map
index 20f778be9710..09beaa607d83 100644
--- a/libcxx/include/ext/hash_map
+++ b/libcxx/include/ext/hash_map
@@ -394,10 +394,10 @@ public:
         return __t;
     }
 
-    friend _LIBCPP_INLINE_VISIBILITY 
+    friend _LIBCPP_INLINE_VISIBILITY
     bool operator==(const __hash_map_iterator& __x, const __hash_map_iterator& __y)
         {return __x.__i_ == __y.__i_;}
-    friend _LIBCPP_INLINE_VISIBILITY 
+    friend _LIBCPP_INLINE_VISIBILITY
     bool operator!=(const __hash_map_iterator& __x, const __hash_map_iterator& __y)
         {return __x.__i_ != __y.__i_;}
 
diff --git a/libcxx/include/forward_list b/libcxx/include/forward_list
index d59ddd4ef97a..29dc6615800e 100644
--- a/libcxx/include/forward_list
+++ b/libcxx/include/forward_list
@@ -1525,7 +1525,7 @@ forward_list<_Tp, _Alloc>::remove(const value_type& __v)
         else
             ++__i;
     }
-    
+
     return (__remove_return_type) __count_removed;
 }
 
@@ -1553,7 +1553,7 @@ forward_list<_Tp, _Alloc>::remove_if(_Predicate __pred)
         else
             ++__i;
     }
-    
+
     return (__remove_return_type) __count_removed;
 }
 
@@ -1573,7 +1573,7 @@ forward_list<_Tp, _Alloc>::unique(_BinaryPredicate __binary_pred)
             __deleted_nodes.splice_after(__deleted_nodes.before_begin(), *this, __i, __j);
         __i = __j;
     }
-    
+
     return (__remove_return_type) __count_removed;
 }
 
diff --git a/libcxx/include/list b/libcxx/include/list
index c92ef79282ed..02d41644be33 100644
--- a/libcxx/include/list
+++ b/libcxx/include/list
@@ -2211,7 +2211,7 @@ list<_Tp, _Alloc>::unique(_BinaryPred __binary_pred)
             __i = __j;
             }
     }
-    
+
     return (__remove_return_type) __deleted_nodes.size();
 }
 
diff --git a/libcxx/include/support/ibm/xlocale.h b/libcxx/include/support/ibm/xlocale.h
index 9f0522c199e0..431bf6268766 100644
--- a/libcxx/include/support/ibm/xlocale.h
+++ b/libcxx/include/support/ibm/xlocale.h
@@ -87,7 +87,7 @@ int isxdigit_l(int c, locale_t locale)
 static inline
 int iswalnum_l(wchar_t wc, locale_t locale)
 {
-  return __xiswalnum(locale, wc); 
+  return __xiswalnum(locale, wc);
 }
 
 static inline
@@ -159,7 +159,7 @@ int iswxdigit_l(wchar_t wc, locale_t locale)
 static inline
 int iswctype_l(wint_t wc, wctype_t desc, locale_t locale)
 {
-  return __xiswctype(locale, wc, desc); 
+  return __xiswctype(locale, wc, desc);
 }
 
 static inline
@@ -261,7 +261,7 @@ int vasprintf(char **strp, const char *fmt, va_list ap)
     str_size = vsnprintf(*strp, str_size + 1, fmt,  ap);
   }
   return str_size;
-}  
+}
 
 #ifdef __cplusplus
 }
diff --git a/libcxx/include/support/solaris/wchar.h b/libcxx/include/support/solaris/wchar.h
index 9dc9ac3f006c..f01fd743a23c 100644
--- a/libcxx/include/support/solaris/wchar.h
+++ b/libcxx/include/support/solaris/wchar.h
@@ -26,7 +26,7 @@
 #define wctype sun_wctype
 #define _WCHAR_T 1
 #include_next "wchar.h"
-#undef iswalpha 
+#undef iswalpha
 #undef iswupper
 #undef iswlower
 #undef iswdigit