Skip to content

Commit 15a033f

Browse files
authored
Merge branch 'master' into add-test-requirement
2 parents 391be7b + 3a0fdce commit 15a033f

File tree

7 files changed

+1462
-949
lines changed

7 files changed

+1462
-949
lines changed

CMakeLists.txt

+3
Original file line numberDiff line numberDiff line change
@@ -547,6 +547,9 @@ if(opencoarrays_aware_compiler)
547547
add_mpi_test(register_alloc_comp_2 2 ${tests_root}/unit/init_register/register_alloc_comp_2)
548548
add_mpi_test(register_alloc_comp_3 2 ${tests_root}/unit/init_register/register_alloc_comp_3)
549549
add_mpi_test(async_comp_alloc 6 ${tests_root}/unit/init_register/async_comp_alloc)
550+
add_mpi_test(async_comp_alloc_2 2 ${tests_root}/unit/init_register/async_comp_alloc_2)
551+
add_mpi_test(comp_allocated_1 2 ${tests_root}/unit/init_register/comp_allocated_1)
552+
add_mpi_test(comp_allocated_2 2 ${tests_root}/unit/init_register/comp_allocated_2)
550553
endif()
551554
add_mpi_test(get_array 2 ${tests_root}/unit/send-get/get_array)
552555
add_mpi_test(get_self 2 ${tests_root}/unit/send-get/get_self)

src/libcaf.h

-8
Original file line numberDiff line numberDiff line change
@@ -94,14 +94,6 @@ typedef void* caf_token_t;
9494
typedef void * caf_team_t;
9595
#endif
9696

97-
/* Linked list of static coarrays registered. */
98-
typedef struct caf_static_t {
99-
caf_token_t token;
100-
caf_token_t stopped_token;
101-
struct caf_static_t *prev;
102-
}
103-
caf_static_t;
104-
10597
/* When there is a vector subscript in this dimension, nvec == 0, otherwise,
10698
lower_bound, upper_bound, stride contains the bounds relative to the declared
10799
bounds; kind denotes the integer kind of the elements of vector[]. */

0 commit comments

Comments
 (0)