maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

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

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

Differential Revision: https://reviews.llvm.org/D128655
This commit is contained in:
Louis Dionne 2022-06-27 11:37:01 -04:00
parent fc7f7260a6
commit a2c1603206
5 changed files with 14 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libcxx/include/__algorithm/ranges_minmax.h
View File

@ -31,6 +31,9 @@
#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)
_LIBCPP_PUSH_MACROS
#include <__undef_macros>
_LIBCPP_BEGIN_NAMESPACE_STD
namespace ranges {
@ -123,6 +126,8 @@ inline namespace __cpo {
_LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)
#endif // _LIBCPP___ALGORITHM_RANGES_MINMAX_H

5
libcxx/include/__ranges/drop_view.h
View File

@ -40,6 +40,9 @@
# 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)
@ -298,4 +301,6 @@ inline namespace __cpo {
_LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
#endif // _LIBCPP___RANGES_DROP_VIEW_H

19
libcxx/test/libcxx/containers/associative/undef_min_max.pass.cpp
View File

@ -1,19 +0,0 @@
//===----------------------------------------------------------------------===//
//
// 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;
}

4
libcxx/test/libcxx/nasty_macros.compile.pass.cpp
View File

@ -136,6 +136,10 @@
#define Xp NASTY_MACRO
#define Xs NASTY_MACRO
// The classic Windows min/max macros
#define min NASTY_MACRO
#define max NASTY_MACRO
/*
BEGIN-SCRIPT

13
libcxx/test/libcxx/numerics/c.math/undef_min_max.pass.cpp
View File

@ -1,13 +0,0 @@
//
// 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; }