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

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-c.cfa (moved) (moved from tests/array-container/dimexpr-match-c.cfa ) (4 diffs)

tests/array-collections/dimexpr-match-c.cfa

@@ -16 +16 @@
 #include "dimexpr-match.hfa"     // test framework
 
+#ifdef TRY_WISH_1 // "unification as-if"
+forall( [N] )
+void zip( float (*a)[N], float (*b)[N] ) {}
+#endif
+
 DECLN_runTests {
 
@@ -21 +26 @@
     int mut7 = 7, mut42 = 42;
 
-    
     #define TRY_COMPAT( LV, RV )        \
     {                                   \
@@ -79 +83 @@
 
   #ifdef TRY_WISH_1 // "unification as-if"
-    forall( [N] )
-    void zip( float (*a)[N], float (*b)[N] ) {}
-
     #define TRY_COMPAT( LV, RV )        \
     {                                   \
@@ -93 +94 @@
 
   #endif
-
-
-
 }