From: Jonathan Wakely <jwakely@redhat.com>
Date: Mon, 11 Mar 2019 13:46:09 +0000 (+0000)
Subject: Change test to use const variables instead of macros
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=355d4eb36aeb970743537e2f9b98d4c53c9e0eab;p=gcc.git

Change test to use const variables instead of macros

This is C++ so there's no reason to use macros here.

	* testsuite/29_atomics/atomic_flag/test_and_set/explicit-hle.cc: Use
	const variables instead of macros.

From-SVN: r269585
---

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 4d99b05f3ec..9c5b1bbaf7a 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,8 @@
 2019-03-11  Jonathan Wakely  <jwakely@redhat.com>
 
+	* testsuite/29_atomics/atomic_flag/test_and_set/explicit-hle.cc: Use
+	const variables instead of macros.
+
 	PR libstdc++/89629
 	* libsupc++/hash_bytes.cc [__SIZEOF_SIZE_T__ == 8] (_Hash_bytes):
 	Use correct type for len_aligned.
diff --git a/libstdc++-v3/testsuite/29_atomics/atomic_flag/test_and_set/explicit-hle.cc b/libstdc++-v3/testsuite/29_atomics/atomic_flag/test_and_set/explicit-hle.cc
index e05b7a5fd6e..568d0d7d007 100644
--- a/libstdc++-v3/testsuite/29_atomics/atomic_flag/test_and_set/explicit-hle.cc
+++ b/libstdc++-v3/testsuite/29_atomics/atomic_flag/test_and_set/explicit-hle.cc
@@ -25,8 +25,8 @@
 
 #include <atomic>
 
-#define ACQ memory_order_acquire | __memory_order_hle_acquire
-#define REL memory_order_release | __memory_order_hle_release
+const auto ACQ = std::memory_order_acquire | std::__memory_order_hle_acquire;
+const auto REL = std::memory_order_release | std::__memory_order_hle_release;
 
 int main()
 {