Changeset 48ec19a for tests/array-container/dimexpr-match.hfa

Timestamp:

Jun 26, 2023, 10:51:47 AM (2 years ago)

Author:

caparson <caparson@…>

Branches:

master

Children:

917e1fd

Parents:

adc73a5 (diff), 1fbf481 (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:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

• tests/array-container/dimexpr-match.hfa (modified) (1 diff)

tests/array-container/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