diff options
Diffstat (limited to 'src/solvers/coord/multisolve.h')
| -rw-r--r-- | src/solvers/coord/multisolve.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/solvers/coord/multisolve.h b/src/solvers/coord/multisolve.h index 28f03bb..efd287d 100644 --- a/src/solvers/coord/multisolve.h +++ b/src/solvers/coord/multisolve.h | |||
| @@ -72,8 +72,7 @@ STATIC int64_t | |||
| 72 | solve_multicoord_dfs(dfsarg_solve_multicoord_t arg[NON_NULL]) | 72 | solve_multicoord_dfs(dfsarg_solve_multicoord_t arg[NON_NULL]) |
| 73 | { | 73 | { |
| 74 | uint8_t m, l, i; | 74 | uint8_t m, l, i; |
| 75 | uint32_t mm; | 75 | uint64_t mm, coord; |
| 76 | uint64_t coord; | ||
| 77 | int64_t n, ret; | 76 | int64_t n, ret; |
| 78 | const coord_t *c; | 77 | const coord_t *c; |
| 79 | cube_t backup_cube, backup_inverse; | 78 | cube_t backup_cube, backup_inverse; |
| @@ -108,7 +107,7 @@ solve_multicoord_dfs_notsolved: | |||
| 108 | arg->solution_moves->nmoves++; | 107 | arg->solution_moves->nmoves++; |
| 109 | 108 | ||
| 110 | for (m = 0; m < NMOVES; m++) { | 109 | for (m = 0; m < NMOVES; m++) { |
| 111 | if (!(mm & (UINT32_C(1) << (uint32_t)m))) | 110 | if (!(mm & (UINT64_C(1) << (uint64_t)m))) |
| 112 | continue; | 111 | continue; |
| 113 | 112 | ||
| 114 | arg->solution_moves->moves[l] = m; | 113 | arg->solution_moves->moves[l] = m; |
| @@ -163,9 +162,10 @@ solve_multicoord_dispatch( | |||
| 163 | return NISSY_ERROR_INVALID_SOLVER; | 162 | return NISSY_ERROR_INVALID_SOLVER; |
| 164 | } | 163 | } |
| 165 | 164 | ||
| 166 | return solve_multicoord(oc, mcoord, trans, minmoves, | 165 | return solve_multicoord(oc, mcoord, trans, (uint8_t)minmoves, |
| 167 | maxmoves, maxsolutions, optimal, threads, data_size, data, | 166 | (uint8_t)maxmoves, (uint8_t)maxsolutions, (uint8_t)optimal, |
| 168 | solutions_size, sols, poll_status, poll_status_data); | 167 | (uint8_t)threads, data_size, data, solutions_size, sols, |
| 168 | poll_status, poll_status_data); | ||
| 169 | } | 169 | } |
| 170 | 170 | ||
| 171 | STATIC int64_t | 171 | STATIC int64_t |
