[libcxx-commits] [libcxx] 2b91dba - [libc++] allow redefined macro in non_trivial_copy_move_ABI test

[Ed Maste via libcxx-commits]

Author: Ed Maste
Date: 2023-01-16T08:49:13-05:00
New Revision: 2b91dbae650e7a336a7d49b19f5181d163c1fe21

URL: https://github.com/llvm/llvm-project/commit/2b91dbae650e7a336a7d49b19f5181d163c1fe21
DIFF: https://github.com/llvm/llvm-project/commit/2b91dbae650e7a336a7d49b19f5181d163c1fe21.diff

LOG: [libc++] allow redefined macro in non_trivial_copy_move_ABI test

__config defines _LIBCPP_DEPRECATED_ABI_DISABLE_PAIR_TRIVIAL_COPY_CTOR
on FreeBSD, which conflicts with a command-line definition used by the
non_trivial_copy_move_ABI test.

Add -Wno-macro-redefined to ADDITIONAL_COMPILE_FLAGS in this test.

Reviewed By: philnik

Differential Revision: https://reviews.llvm.org/D141774

Added: 
    

Modified: 
    libcxx/test/libcxx/utilities/utility/pairs/pairs.pair/non_trivial_copy_move_ABI.pass.cpp

Removed: 
    


################################################################################
diff  --git a/libcxx/test/libcxx/utilities/utility/pairs/pairs.pair/non_trivial_copy_move_ABI.pass.cpp b/libcxx/test/libcxx/utilities/utility/pairs/pairs.pair/non_trivial_copy_move_ABI.pass.cpp
index ddd2c2b7231fb..0504602e79dff 100644
--- a/libcxx/test/libcxx/utilities/utility/pairs/pairs.pair/non_trivial_copy_move_ABI.pass.cpp
+++ b/libcxx/test/libcxx/utilities/utility/pairs/pairs.pair/non_trivial_copy_move_ABI.pass.cpp
@@ -17,6 +17,7 @@
 // Test that we provide the non-trivial copy operations when _LIBCPP_DEPRECATED_ABI_DISABLE_PAIR_TRIVIAL_COPY_CTOR
 // is specified.
 // ADDITIONAL_COMPILE_FLAGS: -D_LIBCPP_DEPRECATED_ABI_DISABLE_PAIR_TRIVIAL_COPY_CTOR
+// ADDITIONAL_COMPILE_FLAGS: -Wno-macro-redefined
 
 #include <utility>
 #include <type_traits>