[libc++] Add a few missing min/max macro push/pop

[ldionne]

Summary

Also, improve the test for nasty macros to define min and max, so this
will be caught in the future.

[Mordante]

Nice catch! LGTM when the CI is happy.

libcxx/test/libcxx/nasty_macros.compile.pass.cpp

141

Interesting they weren't in the list yet.

libcxx/include/__algorithm/ranges_minmax.h

 #include <initializer_list>
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
 #endif
 
 #if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)
 
+_LIBCPP_PUSH_MACROS
+#include <__undef_macros>
+
 _LIBCPP_BEGIN_NAMESPACE_STD
 
 namespace ranges {
 template <class _T1>
 using minmax_result = min_max_result<_T1>;
 
 namespace __minmax {
 struct __fn {

 
 inline namespace __cpo {
   inline constexpr auto minmax = __minmax::__fn{};
 } // namespace __cpo
 } // namespace ranges
 
 _LIBCPP_END_NAMESPACE_STD
 
+_LIBCPP_POP_MACROS
+
 #endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)
 
 #endif // _LIBCPP___ALGORITHM_RANGES_MINMAX_H

libcxx/include/__ranges/drop_view.h

 #include <__utility/move.h>
 #include <concepts>
 #include <type_traits>
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
 #endif
 
+_LIBCPP_PUSH_MACROS
+#include <__undef_macros>
+
 _LIBCPP_BEGIN_NAMESPACE_STD
 
 #if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)
 
 namespace ranges {
   template<view _View>
   class drop_view
     : public view_interface<drop_view<_View>>

 } // namespace views
 
 } // namespace ranges
 
 #endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)
 
 _LIBCPP_END_NAMESPACE_STD
 
+_LIBCPP_POP_MACROS
+
 #endif // _LIBCPP___RANGES_DROP_VIEW_H

libcxx/test/libcxx/containers/associative/undef_min_max.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
-//
-//===----------------------------------------------------------------------===//
-
-#define min THIS IS A NASTY MACRO!
-#define max THIS IS A NASTY MACRO!
-
-#include <map>
-
-int main(int, char**) {
-  std::map<int, int> m;
-  ((void)m);
-
-  return 0;
-}

libcxx/test/libcxx/nasty_macros.compile.pass.cpp

 #define Us NASTY_MACRO
 #define V NASTY_MACRO
 #define Vp NASTY_MACRO
 #define Vs NASTY_MACRO
 #define X NASTY_MACRO
 #define Xp NASTY_MACRO
 #define Xs NASTY_MACRO
 
+// The classic Windows min/max macros
+#define min NASTY_MACRO
+#define max NASTY_MACRO
+
 /*
 BEGIN-SCRIPT
 
 for header in public_headers:
   print("{}#{}include <{}>{}".format(
     '#if ' + header_restrictions[header] + '\n' if header in header_restrictions else '',
     3 * ' ' if header in header_restrictions else '',
     header,

libcxx/test/libcxx/numerics/c.math/undef_min_max.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
-//
-//===----------------------------------------------------------------------===//
-
-#define min THIS IS A NASTY MACRO!
-#define max THIS IS A NASTY MACRO!
-
-#include <cmath>
-
-int main(int, char**) { return 0; }