diff --git a/experimental/test/test_AllKtruss.c b/experimental/test/test_AllKtruss.c index 41ac3b8c36..985efe470c 100644 --- a/experimental/test/test_AllKtruss.c +++ b/experimental/test/test_AllKtruss.c @@ -55,7 +55,7 @@ const matrix_info files [ ] = void test_AllKTruss (void) { LAGraph_Init (msg) ; - OK (GrB_Global_set_INT32 (GrB_GLOBAL, true, (GrB_Field) GxB_BURBLE)) ; + OK (GrB_Global_set_INT32 (GrB_GLOBAL, true, GxB_BURBLE)) ; for (int id = 0 ; ; id++) { diff --git a/experimental/test/test_FastGraphletTransform.c b/experimental/test/test_FastGraphletTransform.c index 96f3082b6f..1fe0f5def8 100644 --- a/experimental/test/test_FastGraphletTransform.c +++ b/experimental/test/test_FastGraphletTransform.c @@ -79,7 +79,7 @@ int64_t A_graphlet_counts [ ] = void test_FastGraphletTransform(void) { LAGraph_Init (msg) ; - OK (GrB_Global_set_INT32 (GrB_GLOBAL, true, (GrB_Field) GxB_BURBLE)) ; + OK (GrB_Global_set_INT32 (GrB_GLOBAL, true, GxB_BURBLE)) ; #if LAGRAPH_SUITESPARSE GrB_Matrix A = NULL, F_net = NULL ; diff --git a/src/test/test_Cached_SymmetricStructure.c b/src/test/test_Cached_SymmetricStructure.c index 8e0df4419d..56a420864a 100644 --- a/src/test/test_Cached_SymmetricStructure.c +++ b/src/test/test_Cached_SymmetricStructure.c @@ -34,7 +34,7 @@ char filename [LEN+1] ; void setup (void) { OK (LAGraph_Init (msg)) ; -// GrB_set (GrB_GLOBAL, true, (GrB_Field) GxB_BURBLE) ; +// GrB_set (GrB_GLOBAL, true, GxB_BURBLE) ; } //------------------------------------------------------------------------------ diff --git a/src/test/test_ConnectedComponents.c b/src/test/test_ConnectedComponents.c index 33cba2b34f..73bceff3d6 100644 --- a/src/test/test_ConnectedComponents.c +++ b/src/test/test_ConnectedComponents.c @@ -82,7 +82,7 @@ void test_cc_matrices (void) { OK (LAGraph_Init (msg)) ; -// GrB_set (GrB_GLOBAL, true, (GrB_Field) GxB_BURBLE) ; +// GrB_set (GrB_GLOBAL, true, GxB_BURBLE) ; for (int k = 0 ; ; k++) { @@ -180,7 +180,7 @@ void test_cc_matrices (void) void test_cc_errors (void) { OK (LAGraph_Init (msg)) ; -// GrB_set (GrB_GLOBAL, true, (GrB_Field) GxB_BURBLE) ; +// GrB_set (GrB_GLOBAL, true, GxB_BURBLE) ; printf ("\n") ; // check for null pointers diff --git a/src/test/test_Init.c b/src/test/test_Init.c index 621dedda7e..db97ea586f 100644 --- a/src/test/test_Init.c +++ b/src/test/test_Init.c @@ -60,10 +60,9 @@ void test_Init (void) #if LAGRAPH_SUITESPARSE char compiler [1024] ; int compiler_version [3] ; - OK (GrB_Global_get_String (GrB_GLOBAL, compiler, - (GrB_Field) GxB_COMPILER_NAME)) ; + OK (GrB_Global_get_String (GrB_GLOBAL, compiler, GxB_COMPILER_NAME)) ; OK (GrB_Global_get_VOID (GrB_GLOBAL, (void *) compiler_version, - (GrB_Field) GxB_COMPILER_VERSION)) ; + GxB_COMPILER_VERSION)) ; printf ("GraphBLAS compiled with: %s v%d.%d.%d\n", compiler, compiler_version [0], compiler_version [1], compiler_version [2]) ; #endif diff --git a/src/test/test_SingleSourceShortestPath.c b/src/test/test_SingleSourceShortestPath.c index 7a87b0ee0d..bb64a6f4a5 100644 --- a/src/test/test_SingleSourceShortestPath.c +++ b/src/test/test_SingleSourceShortestPath.c @@ -71,7 +71,7 @@ const matrix_info files [ ] = void test_SingleSourceShortestPath(void) { LAGraph_Init(msg); -// GrB_Global_set_INT32 (GrB_GLOBAL, true, (GrB_Field) GxB_BURBLE) ; +// GrB_Global_set_INT32 (GrB_GLOBAL, true, GxB_BURBLE) ; GrB_Matrix A = NULL, T = NULL ; GrB_Scalar Delta = NULL ; OK (GrB_Scalar_new (&Delta, GrB_INT32)) ; diff --git a/src/utility/LAGr_Init.c b/src/utility/LAGr_Init.c index 45c367bb8a..ac4411fecf 100644 --- a/src/utility/LAGr_Init.c +++ b/src/utility/LAGr_Init.c @@ -183,16 +183,16 @@ int LAGr_Init // ask SuiteSparse:GraphBLAS for the function pointers GRB_TRY (GrB_Global_get_VOID (GrB_GLOBAL, (void *) (&LAGraph_Malloc_function), - (GrB_Field) GxB_MALLOC_FUNCTION)) ; + GxB_MALLOC_FUNCTION)) ; GRB_TRY (GrB_Global_get_VOID (GrB_GLOBAL, (void *) (&LAGraph_Calloc_function), - (GrB_Field) GxB_CALLOC_FUNCTION)) ; + GxB_CALLOC_FUNCTION)) ; GRB_TRY (GrB_Global_get_VOID (GrB_GLOBAL, (void *) (&LAGraph_Realloc_function), - (GrB_Field) GxB_REALLOC_FUNCTION)) ; + GxB_REALLOC_FUNCTION)) ; GRB_TRY (GrB_Global_get_VOID (GrB_GLOBAL, (void *) (&LAGraph_Free_function), - (GrB_Field) GxB_FREE_FUNCTION)) ; + GxB_FREE_FUNCTION)) ; #else LAGraph_Malloc_function = user_malloc_function ; LAGraph_Calloc_function = user_calloc_function ; diff --git a/src/utility/LG_internal.h b/src/utility/LG_internal.h index d4df34d737..9ffad7a186 100644 --- a/src/utility/LG_internal.h +++ b/src/utility/LG_internal.h @@ -631,19 +631,19 @@ int LG_KindName #define LG_BITMAP GxB_BITMAP #define LG_FULL GxB_FULL #define LG_SET_FORMAT_HINT(object,sparsity) \ - GrB_set (object, (int32_t) (sparsity), (GrB_Field) GxB_SPARSITY_CONTROL) + GrB_set (object, (int32_t) (sparsity), GxB_SPARSITY_CONTROL) #define LG_GET_FORMAT_HINT(A,status) \ - GrB_get (A, (int32_t *) status, (GrB_Field) GxB_SPARSITY_STATUS) + GrB_get (A, (int32_t *) status, GxB_SPARSITY_STATUS) #define LG_SET_NTHREADS(nthreads) \ - GrB_set (GrB_GLOBAL, (int32_t) (nthreads), (GrB_Field) GxB_NTHREADS) + GrB_set (GrB_GLOBAL, (int32_t) (nthreads), GxB_NTHREADS) #define LG_SET_HYPER_SWITCH(A,hyper) \ - GrB_set (A, hyper, (GrB_Field) GxB_HYPER_SWITCH) + GrB_set (A, hyper, GxB_HYPER_SWITCH) #define LG_GET_HYPER_SWITCH(A,hyper) \ - GrB_get (A, hyper, (GrB_Field) GxB_HYPER_SWITCH) + GrB_get (A, hyper, GxB_HYPER_SWITCH) #define LG_SET_BURBLE(burble) \ - GrB_set (GrB_GLOBAL, (int32_t) (burble), (GrB_Field) GxB_BURBLE) + GrB_set (GrB_GLOBAL, (int32_t) (burble), GxB_BURBLE) #define LG_GET_LIBRARY_DATE(date) \ - GrB_get (GrB_GLOBAL, (char *) date, (GrB_Field) GxB_LIBRARY_DATE) + GrB_get (GrB_GLOBAL, (char *) date, GxB_LIBRARY_DATE) #else