[libc++] Fix some typos and remove unused macros. NFCI.

[• Quuxplusone]

Summary

Depends on D100736.

[ldionne]

LGTM after fixing the test and making sure CI is green. Thanks!

libcxx/test/std/containers/sequences/list/list.capacity/resize_size.pass.cpp

36

This test will need to be fixed in C++03.

[• Quuxplusone]

Fix tests in C++03 mode. Poke buildbot. Will land, if this buildkite run passes.

[ldionne]

This looks OK to me, the only CI failure was a fluke. Feel free to commit as-is.

[• Quuxplusone]

Merged e6972024c807dc9fac88eca6507b6635700edf07 and b98b6d99c5e13db7ea4914d8d4be43e6f244a114.

libcxx/include/__bits

 }
 
 #endif // _LIBCPP_COMPILER_MSVC
 
 _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif  // _LIBCPP__BITS
+#endif  // _LIBCPP___BITS

libcxx/include/__config

 #    if defined(_DLL)
 #      pragma comment(lib, "c++.lib")
 #    else
 #      pragma comment(lib, "libc++.lib")
 #    endif
 #  endif // defined(_LIBCPP_ABI_MICROSOFT) && !defined(_LIBCPP_BUILDING_LIBRARY)
 #endif // _LIBCPP_NO_AUTO_LINK
 
-#define _LIBCPP_UNUSED_VAR(x) ((void)(x))
-
 // Configures the fopen close-on-exec mode character, if any. This string will
 // be appended to any mode string used by fstream for fopen/fdopen.
 //
 // Not all platforms support this, but it helps avoid fd-leaks on platforms that
 // do.
 #if defined(__BIONIC__)
 #  define _LIBCPP_FOPEN_CLOEXEC_MODE "e"
 #else

libcxx/include/__node_handle

struct _LIBCPP_TEMPLATE_VIS __insert_return_type
     _NodeType node;
 };
 
 #endif // _LIBCPP_STD_VER > 14
 
 _LIBCPP_END_NAMESPACE_STD
 _LIBCPP_POP_MACROS
 
-#endif
+#endif  // _LIBCPP___NODE_HANDLE

libcxx/include/experimental/__config

 #define _LIBCPP_BEGIN_NAMESPACE_LFTS_V2 _LIBCPP_BEGIN_NAMESPACE_EXPERIMENTAL inline namespace fundamentals_v2 {
 #define _LIBCPP_END_NAMESPACE_LFTS_V2  } } }
 #define _VSTD_LFTS_V2 _VSTD_EXPERIMENTAL::fundamentals_v2
 
 #define _LIBCPP_BEGIN_NAMESPACE_LFTS_PMR _LIBCPP_BEGIN_NAMESPACE_LFTS namespace pmr {
 #define _LIBCPP_END_NAMESPACE_LFTS_PMR _LIBCPP_END_NAMESPACE_LFTS }
 #define _VSTD_LFTS_PMR _VSTD_LFTS::pmr
 
-#define _LIBCPP_BEGIN_NAMESPACE_CHRONO_LFTS _LIBCPP_BEGIN_NAMESPACE_STD        \
-  namespace chrono { namespace experimental { inline namespace fundamentals_v1 {
-#define _LIBCPP_END_NAMESPACE_CHRONO_LFTS _LIBCPP_END_NAMESPACE_STD } } }
-
 #if defined(_LIBCPP_NO_EXPERIMENTAL_DEPRECATION_WARNING_FILESYSTEM)
 #   define _LIBCPP_DEPRECATED_EXPERIMENTAL_FILESYSTEM /* nothing */
 #else
 #   define _LIBCPP_DEPRECATED_EXPERIMENTAL_FILESYSTEM __attribute__((deprecated("std::experimental::filesystem has now been deprecated in favor of C++17's std::filesystem. Please stop using it and start using std::filesystem. This experimental version will be removed in LLVM 11. You can remove this warning by defining the _LIBCPP_NO_EXPERIMENTAL_DEPRECATION_WARNING_FILESYSTEM macro.")))
 #endif
 
 #define _LIBCPP_BEGIN_NAMESPACE_EXPERIMENTAL_FILESYSTEM \
     _LIBCPP_BEGIN_NAMESPACE_EXPERIMENTAL namespace filesystem _LIBCPP_DEPRECATED_EXPERIMENTAL_FILESYSTEM { \

libcxx/include/locale

 messages<_CharT>::do_open(const basic_string<char>& __nm, const locale&) const
 {
 #ifdef _LIBCPP_HAS_CATOPEN
     catalog __cat = (catalog)catopen(__nm.c_str(), NL_CAT_LOCALE);
     if (__cat != -1)
         __cat = static_cast<catalog>((static_cast<size_t>(__cat) >> 1));
     return __cat;
 #else // !_LIBCPP_HAS_CATOPEN
-    _LIBCPP_UNUSED_VAR(__nm);
+    (void)__nm;
     return -1;
 #endif // _LIBCPP_HAS_CATOPEN
 }
 
 template <class _CharT>
 typename messages<_CharT>::string_type
 messages<_CharT>::do_get(catalog __c, int __set, int __msgid,
                          const string_type& __dflt) const
 {
 #ifdef _LIBCPP_HAS_CATOPEN
     string __ndflt;
     __narrow_to_utf8<sizeof(char_type)*__CHAR_BIT__>()(back_inserter(__ndflt),
                                                        __dflt.c_str(),
                                                        __dflt.c_str() + __dflt.size());
     if (__c != -1)
         __c <<= 1;
     nl_catd __cat = (nl_catd)__c;
     char* __n = catgets(__cat, __set, __msgid, __ndflt.c_str());
     string_type __w;
     __widen_from_utf8<sizeof(char_type)*__CHAR_BIT__>()(back_inserter(__w),
                                                         __n, __n + _VSTD::strlen(__n));
     return __w;
 #else // !_LIBCPP_HAS_CATOPEN
-    _LIBCPP_UNUSED_VAR(__c);
-    _LIBCPP_UNUSED_VAR(__set);
-    _LIBCPP_UNUSED_VAR(__msgid);
+    (void)__c;
+    (void)__set;
+    (void)__msgid;
     return __dflt;
 #endif // _LIBCPP_HAS_CATOPEN
 }
 
 template <class _CharT>
 void
 messages<_CharT>::do_close(catalog __c) const
 {
 #ifdef _LIBCPP_HAS_CATOPEN
     if (__c != -1)
         __c <<= 1;
     nl_catd __cat = (nl_catd)__c;
     catclose(__cat);
 #else // !_LIBCPP_HAS_CATOPEN
-    _LIBCPP_UNUSED_VAR(__c);
+    (void)__c;
 #endif // _LIBCPP_HAS_CATOPEN
 }
 
 _LIBCPP_EXTERN_TEMPLATE_EVEN_IN_DEBUG_MODE(class _LIBCPP_EXTERN_TEMPLATE_TYPE_VIS messages<char>)
 _LIBCPP_EXTERN_TEMPLATE_EVEN_IN_DEBUG_MODE(class _LIBCPP_EXTERN_TEMPLATE_TYPE_VIS messages<wchar_t>)
 
 template <class _CharT>
 class _LIBCPP_TEMPLATE_VIS messages_byname

libcxx/include/unordered_map

     if (__i != end())
         return __i->second;
     __node_holder __h = __construct_node_with_key(__k);
     pair<iterator, bool> __r = __table_.__node_insert_unique(__h.get());
     __h.release();
     return __r.first->second;
 }
 
-#endif  // _LIBCPP_CXX03_MODE
+#endif  // _LIBCPP_CXX03_LANG
 
 template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
 _Tp&
 unordered_map<_Key, _Tp, _Hash, _Pred, _Alloc>::at(const key_type& __k)
 {
     iterator __i = find(__k);
     if (__i == end())
         __throw_out_of_range("unordered_map::at: key not found");

libcxx/test/libcxx/depr/depr.auto.ptr/auto.ptr/auto_ptr.cxx1z.pass.cpp

 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
 // <memory>
 
 // template <class X>
 // class auto_ptr;
 //
 //  In C++17, auto_ptr has been removed.
-//  However, for backwards compatibility, if _LIBCPP_NO_REMOVE_AUTOPTR
+//  However, for backwards compatibility, if _LIBCPP_ENABLE_CXX17_REMOVED_AUTO_PTR
 //  is defined before including <memory>, then auto_ptr will be restored.
 
 // ADDITIONAL_COMPILE_FLAGS: -D_LIBCPP_ENABLE_CXX17_REMOVED_AUTO_PTR
 // ADDITIONAL_COMPILE_FLAGS: -D_LIBCPP_DISABLE_DEPRECATION_WARNINGS
 
 #include <memory>
 #include <type_traits>
 
 #include "test_macros.h"
 
 int main(int, char**)
 {
     std::auto_ptr<int> p;
 
   return 0;
 }

libcxx/test/std/containers/sequences/list/list.capacity/resize_size.pass.cpp

int main(int, char**)
     {
         std::list<int> l(5, 2);
         l.resize(10);
         assert(l.size() == 10);
         assert(std::distance(l.begin(), l.end()) == 10);
         assert(l.front() == 2);
         assert(l.back() == 0);
     }
-#ifdef __LIBCPP_MOVE
+#if TEST_STD_VER >= 11
     {
         std::list<DefaultOnly> l(10);
         l.resize(5);
         assert(l.size() == 5);
         assert(std::distance(l.begin(), l.end()) == 5);
     }
     {
         std::list<DefaultOnly> l(10);
         l.resize(20);
         assert(l.size() == 20);
         assert(std::distance(l.begin(), l.end()) == 20);
     }
-#endif  // __LIBCPP_MOVE
-#if TEST_STD_VER >= 11
     {
         std::list<int, min_allocator<int>> l(5, 2);
         l.resize(2);
         assert(l.size() == 2);
         assert(std::distance(l.begin(), l.end()) == 2);
         assert((l == std::list<int, min_allocator<int>>(2, 2)));
     }
     {
         std::list<int, min_allocator<int>> l(5, 2);
         l.resize(10);
         assert(l.size() == 10);
         assert(std::distance(l.begin(), l.end()) == 10);
         assert(l.front() == 2);
         assert(l.back() == 0);
     }
-#ifdef __LIBCPP_MOVE
     {
         std::list<DefaultOnly, min_allocator<DefaultOnly>> l(10);
         l.resize(5);
         assert(l.size() == 5);
         assert(std::distance(l.begin(), l.end()) == 5);
     }
     {
         std::list<DefaultOnly, min_allocator<DefaultOnly>> l(10);
         l.resize(20);
         assert(l.size() == 20);
         assert(std::distance(l.begin(), l.end()) == 20);
     }
-#endif  // __LIBCPP_MOVE
 #endif
 
   return 0;
 }