浏览代码

Fix whitespace

git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@113089 91177308-0d34-0410-b5e6-96231b3b80d8
Howard Hinnant 15 年之前
父节点
当前提交
bfd5530c06
共有 5 个文件被更改,包括 6 次插入7 次删除
  1. 1 1
      include/__hash_table
  2. 1 1
      include/locale
  3. 3 3
      include/map
  4. 0 1
      src/future.cpp
  5. 1 1
      test/thread/futures/futures.future_error/what.pass.cpp

+ 1 - 1
include/__hash_table

@@ -619,7 +619,7 @@ private:
 #ifndef _LIBCPP_HAS_NO_VARIADICS
 #ifndef _LIBCPP_HAS_NO_VARIADICS
     template <class ..._Args>
     template <class ..._Args>
         __node_holder __construct_node(_Args&& ...__args);
         __node_holder __construct_node(_Args&& ...__args);
-#endif
+#endif  // _LIBCPP_HAS_NO_VARIADICS
     __node_holder __construct_node(value_type&& __v, size_t __hash);
     __node_holder __construct_node(value_type&& __v, size_t __hash);
 #else  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
 #else  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
     __node_holder __construct_node(const value_type& __v);
     __node_holder __construct_node(const value_type& __v);

+ 1 - 1
include/locale

@@ -3628,7 +3628,7 @@ wstring_convert<_Codecvt, _Elem, _Wide_alloc, _Byte_alloc>::
     __wc.__cvtptr_ = nullptr;
     __wc.__cvtptr_ = nullptr;
 }
 }
 
 
-#endif  // _LIBCPP_HAS_NO_VARIADICS
+#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
 
 
 template<class _Codecvt, class _Elem, class _Wide_alloc, class _Byte_alloc>
 template<class _Codecvt, class _Elem, class _Wide_alloc, class _Byte_alloc>
 wstring_convert<_Codecvt, _Elem, _Wide_alloc, _Byte_alloc>::~wstring_convert()
 wstring_convert<_Codecvt, _Elem, _Wide_alloc, _Byte_alloc>::~wstring_convert()

+ 3 - 3
include/map

@@ -463,7 +463,7 @@ public:
         {
         {
             __x.__value_constructed = false;
             __x.__value_constructed = false;
         }
         }
-#endif  // _LIBCPP_HAS_NO_VARIADICS
+#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
 
 
     void operator()(pointer __p)
     void operator()(pointer __p)
     {
     {
@@ -705,7 +705,7 @@ public:
             return *this;
             return *this;
         }
         }
 
 
-#endif  // _LIBCPP_HAS_NO_VARIADICS
+#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
 
 
     explicit map(const allocator_type& __a)
     explicit map(const allocator_type& __a)
         : __tree_(__a)
         : __tree_(__a)
@@ -1378,7 +1378,7 @@ public:
             __tree_.__assign_multi(__il.begin(), __il.end());
             __tree_.__assign_multi(__il.begin(), __il.end());
             return *this;
             return *this;
         }
         }
-#endif  // !defined(_LIBCPP_HAS_NO_RVALUE_REFERENCES) && !defined(_LIBCPP_HAS_NO_VARIADICS)
+#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
 
 
     explicit multimap(const allocator_type& __a)
     explicit multimap(const allocator_type& __a)
         : __tree_(__a)
         : __tree_(__a)

+ 0 - 1
src/future.cpp

@@ -46,7 +46,6 @@ __future_error_category::message(int ev) const
     return string("unspecified future_errc value\n");
     return string("unspecified future_errc value\n");
 }
 }
 
 
-
 const error_category&
 const error_category&
 future_category()
 future_category()
 {
 {

+ 1 - 1
test/thread/futures/futures.future_error/what.pass.cpp

@@ -11,7 +11,7 @@
 
 
 // class future_error
 // class future_error
 
 
-// const char*	what() const throw();
+// const char* what() const throw();
 
 
 #include <future>
 #include <future>
 #include <cstring>
 #include <cstring>