Changeset 2a301ff for tests/array-collections/dimexpr-match.hfa

Timestamp:

Aug 31, 2023, 11:31:15 PM (2 years ago)

Author:

JiadaL <j82liang@…>

Branches:

master

Children:

950c58e

Parents:

92355883 (diff), 686912c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Resolve conflict

File:

• tests/array-collections/dimexpr-match.hfa (moved) (moved from tests/array-container/dimexpr-match.hfa ) (1 diff)

tests/array-collections/dimexpr-match.hfa

@@ -145 +145 @@
 #define EXPAND_AND_QUOTE(str) QUOTE(str)
 #define TRY_COMPAT_E EXPAND_AND_QUOTE(TRY_COMPAT(__L__,__R__))
-
-// Temporary: CFA is classic by default
-#if defined CFA_IS_PREVIEW && defined CFA_IS_CLASSIC
-#error Must not define both CFA_IS_CLASSIC, CFA_IS_PREVIEW
-#endif
-#if ! defined CFA_IS_PREVIEW && ! defined CFA_IS_CLASSIC
-#define CFA_IS_CLASSIC
-#endif
 
 #if ! defined __cforall