1 files changed, 10 insertions, 11 deletions

diff --git a/src/solvers/h48/gendata_cocsep.h b/src/solvers/h48/gendata_cocsep.h
index db7ac95..f83207b 100644
--- a/src/solvers/h48/gendata_cocsep.h
+++ b/src/solvers/h48/gendata_cocsep.h
@@ -1,13 +1,13 @@
 STATIC size_t gendata_cocsep(unsigned char *, uint64_t *, cube_t *);
-STATIC uint32_t gendata_cocsep_dfs(cocsep_dfs_arg_t [static 1]);
+STATIC uint32_t gendata_cocsep_dfs(cocsep_dfs_arg_t [NON_NULL]);
 
 STATIC_INLINE bool gendata_cocsep_get_visited(
-    const uint8_t [static COCSEP_VISITEDSIZE], uint64_t);
+    const uint8_t [SIZE(COCSEP_VISITEDSIZE)], uint64_t);
 STATIC_INLINE void gendata_cocsep_set_visited(
-    uint8_t [static COCSEP_VISITEDSIZE], uint64_t);
+    uint8_t [SIZE(COCSEP_VISITEDSIZE)], uint64_t);
 
 STATIC_INLINE int8_t get_h48_cdata(
-    cube_t, const uint32_t [static COCSEP_TABLESIZE], uint32_t *);
+    cube_t, const uint32_t [SIZE(COCSEP_TABLESIZE)], uint32_t *);
 
 STATIC size_t
 gendata_cocsep(
@@ -79,11 +79,10 @@ gendata_cocsep_return_size:
 }
 
 STATIC uint32_t
-gendata_cocsep_dfs(cocsep_dfs_arg_t arg[static 1])
+gendata_cocsep_dfs(cocsep_dfs_arg_t arg[NON_NULL])
 {
-        uint8_t m;
+        uint8_t m, t;
         uint32_t cc, class, ttrep, depth, olddepth, tinv;
-        uint64_t t;
         uint64_t i, j;
         cube_t d;
         cocsep_dfs_arg_t nextarg;
@@ -105,7 +104,7 @@ gendata_cocsep_dfs(cocsep_dfs_arg_t arg[static 1])
                         d = transform_corners(arg->cube, t);
                         j = coord_cocsep(d);
                         if (i == j && arg->selfsim != NULL)
-                                arg->selfsim[*arg->n] |= UINT64_C(1) << t;
+                                arg->selfsim[*arg->n] |= UINT64_C(1) << (uint64_t)t;
                         if (COCLASS(arg->buf32[j]) != UINT32_C(0xFFFF))
                                 continue;
                         gendata_cocsep_set_visited(arg->visited, j);
@@ -135,7 +134,7 @@ gendata_cocsep_dfs(cocsep_dfs_arg_t arg[static 1])
 
 STATIC_INLINE bool
 gendata_cocsep_get_visited(
-        const uint8_t a[static COCSEP_VISITEDSIZE],
+        const uint8_t a[SIZE(COCSEP_VISITEDSIZE)],
         uint64_t i
 )
 {
@@ -144,7 +143,7 @@ gendata_cocsep_get_visited(
 
 STATIC_INLINE void
 gendata_cocsep_set_visited(
-        uint8_t a[static COCSEP_VISITEDSIZE],
+        uint8_t a[SIZE(COCSEP_VISITEDSIZE)],
         uint64_t i
 )
 {
@@ -154,7 +153,7 @@ gendata_cocsep_set_visited(
 STATIC_INLINE int8_t
 get_h48_cdata(
         cube_t cube,
-        const uint32_t cocsepdata[static COCSEP_TABLESIZE],
+        const uint32_t cocsepdata[SIZE(COCSEP_TABLESIZE)],
         uint32_t *cdata
 )
 {