[libcxx-commits] [libcxx] 8a5e0d9 - [libc++] [test] Don't nasty-macro `__z` yet; we actually use that one.

[Arthur O'Dwyer via libcxx-commits]

Author: Arthur O'Dwyer
Date: 2021-05-01T09:09:06-04:00
New Revision: 8a5e0d956396f07d2241091693f8a714a2483356

URL: https://github.com/llvm/llvm-project/commit/8a5e0d956396f07d2241091693f8a714a2483356
DIFF: https://github.com/llvm/llvm-project/commit/8a5e0d956396f07d2241091693f8a714a2483356.diff

LOG: [libc++] [test] Don't nasty-macro `__z` yet; we actually use that one.

This reverts one of the macros just added in D101613, because it turns out
that the <utility> header actually uses the identifiers __x, __y, __z.
We probably *shouldn't* use __z if it's reserved on Windows; but since
it's not causing us any active problem even on Windows, I think this is
the safest way to unbreak the test.

Added: 
    

Modified: 
    libcxx/test/support/nasty_macros.h

Removed: 
    


################################################################################
diff  --git a/libcxx/test/support/nasty_macros.h b/libcxx/test/support/nasty_macros.h
index 9dab4f84ea19..9aa496bd02e5 100644
--- a/libcxx/test/support/nasty_macros.h
+++ b/libcxx/test/support/nasty_macros.h
@@ -64,7 +64,6 @@
 #define __opt NASTY_MACRO
 #define __out NASTY_MACRO
 #define __part NASTY_MACRO
-#define __z NASTY_MACRO
 #endif
 
 #define __output NASTY_MACRO