Skip to content

Commit 0c9ae71

Browse files
committed
Fixed formatting issue and fixed HighsInt/int build issue.
1 parent 2b64b98 commit 0c9ae71

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

src/interfaces/highs_c_api.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1485,7 +1485,7 @@ const void* Highs_getCallbackDataOutItem(const HighsCallbackDataOut* data_out,
14851485
return nullptr;
14861486
}
14871487

1488-
int Highs_setCallbackSolution(HighsCallbackDataIn* data_in,
1488+
HighsInt Highs_setCallbackSolution(HighsCallbackDataIn* data_in,
14891489
HighsInt num_entries, const double* value) {
14901490
if (data_in != nullptr && data_in->cbdata != nullptr) {
14911491
HighsCallbackInput* obj = static_cast<HighsCallbackInput*>(data_in->cbdata);
@@ -1494,7 +1494,7 @@ int Highs_setCallbackSolution(HighsCallbackDataIn* data_in,
14941494
return static_cast<int>(HighsStatus::kError);
14951495
}
14961496

1497-
int Highs_setCallbackSparseSolution(HighsCallbackDataIn* data_in,
1497+
HighsInt Highs_setCallbackSparseSolution(HighsCallbackDataIn* data_in,
14981498
HighsInt num_entries,
14991499
const HighsInt* index,
15001500
const double* value) {
@@ -1505,7 +1505,7 @@ int Highs_setCallbackSparseSolution(HighsCallbackDataIn* data_in,
15051505
return static_cast<int>(HighsStatus::kError);
15061506
}
15071507

1508-
int Highs_repairCallbackSolution(HighsCallbackDataIn* data_in) {
1508+
HighsInt Highs_repairCallbackSolution(HighsCallbackDataIn* data_in) {
15091509
if (data_in != nullptr && data_in->cbdata != nullptr) {
15101510
HighsCallbackInput* obj = static_cast<HighsCallbackInput*>(data_in->cbdata);
15111511
return static_cast<int>(obj->repairSolution());

src/lp_data/HighsCallback.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ using HighsCallbackFunctionType =
8181
HighsCallbackInput*, void*)>;
8282

8383
struct HighsCallback {
84-
HighsCallback(Highs* highs) : highs(highs) {
84+
HighsCallback(Highs* highs) : highs(highs) {
8585
data_out.highs = highs;
8686
data_in.highs = highs;
8787
clear();

0 commit comments

Comments
 (0)