aboutsummaryrefslogtreecommitdiff
path: root/cpp
diff options
context:
space:
mode:
Diffstat (limited to 'cpp')
-rw-r--r--cpp/nissy.cpp13
1 files changed, 7 insertions, 6 deletions
diff --git a/cpp/nissy.cpp b/cpp/nissy.cpp
index 92b10bd..88df0f2 100644
--- a/cpp/nissy.cpp
+++ b/cpp/nissy.cpp
@@ -18,11 +18,12 @@ extern "C" {
18 long long nissy_getcube(long long, long long, long long, long long, 18 long long nissy_getcube(long long, long long, long long, long long,
19 const char *, char *); 19 const char *, char *);
20 long long nissy_solverinfo(const char *, char *); 20 long long nissy_solverinfo(const char *, char *);
21 long long nissy_gendata(const char *, unsigned long long, char *); 21 long long nissy_gendata(const char *, unsigned long long,
22 long long nissy_checkdata(unsigned long long, const char *); 22 unsigned char *);
23 long long nissy_checkdata(unsigned long long, const unsigned char *);
23 long long nissy_solve(const char *, const char *, unsigned, unsigned, 24 long long nissy_solve(const char *, const char *, unsigned, unsigned,
24 unsigned, unsigned, unsigned, unsigned, unsigned long long, 25 unsigned, unsigned, unsigned, unsigned, unsigned long long,
25 const char *, unsigned, char *, long long *); 26 const unsigned char *, unsigned, char *, long long *);
26 long long nissy_countmoves(const char *); 27 long long nissy_countmoves(const char *);
27 long long nissy_setlogger(void (*)(const char *, void *), void *); 28 long long nissy_setlogger(void (*)(const char *, void *), void *);
28} 29}
@@ -156,7 +157,7 @@ namespace nissy {
156 { 157 {
157 data.resize(size); 158 data.resize(size);
158 auto err = nissy_gendata(name.c_str(), 159 auto err = nissy_gendata(name.c_str(),
159 size, reinterpret_cast<char *>(data.data())); 160 size, reinterpret_cast<unsigned char *>(data.data()));
160 return error{err}; 161 return error{err};
161 } 162 }
162 163
@@ -169,7 +170,7 @@ namespace nissy {
169 error solver::check_data() 170 error solver::check_data()
170 { 171 {
171 auto err_value = nissy_checkdata(data.size(), 172 auto err_value = nissy_checkdata(data.size(),
172 reinterpret_cast<const char *>(data.data())); 173 reinterpret_cast<const unsigned char *>(data.data()));
173 error err{err_value}; 174 error err{err_value};
174 data_checked = err.ok(); 175 data_checked = err.ok();
175 return err; 176 return err;
@@ -199,7 +200,7 @@ namespace nissy {
199 auto err = nissy_solve(cube.to_string().c_str(), 200 auto err = nissy_solve(cube.to_string().c_str(),
200 name.c_str(), niss.value, minmoves, maxmoves, maxsols, 201 name.c_str(), niss.value, minmoves, maxmoves, maxsols,
201 optimal, threads, data.size(), 202 optimal, threads, data.size(),
202 reinterpret_cast<const char *>(data.data()), len, 203 reinterpret_cast<const unsigned char *>(data.data()), len,
203 csols.data(), result.stats.data()); 204 csols.data(), result.stats.data());
204 result.err = error{err}; 205 result.err = error{err};
205 206

Generated with cgit - Back to sebastiano.tronto.net