Skip to content

Commit 11b9f92

Browse files
committed
Fixed formatting issue and fixed HighsInt/int build issue.
1 parent 5e2ecce commit 11b9f92

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

highs/interfaces/highs_c_api.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1493,7 +1493,7 @@ const void* Highs_getCallbackDataOutItem(const HighsCallbackDataOut* data_out,
14931493
return nullptr;
14941494
}
14951495

1496-
int Highs_setCallbackSolution(HighsCallbackDataIn* data_in,
1496+
HighsInt Highs_setCallbackSolution(HighsCallbackDataIn* data_in,
14971497
HighsInt num_entries, const double* value) {
14981498
if (data_in != nullptr && data_in->cbdata != nullptr) {
14991499
HighsCallbackInput* obj = static_cast<HighsCallbackInput*>(data_in->cbdata);
@@ -1502,7 +1502,7 @@ int Highs_setCallbackSolution(HighsCallbackDataIn* data_in,
15021502
return static_cast<int>(HighsStatus::kError);
15031503
}
15041504

1505-
int Highs_setCallbackSparseSolution(HighsCallbackDataIn* data_in,
1505+
HighsInt Highs_setCallbackSparseSolution(HighsCallbackDataIn* data_in,
15061506
HighsInt num_entries,
15071507
const HighsInt* index,
15081508
const double* value) {
@@ -1513,7 +1513,7 @@ int Highs_setCallbackSparseSolution(HighsCallbackDataIn* data_in,
15131513
return static_cast<int>(HighsStatus::kError);
15141514
}
15151515

1516-
int Highs_repairCallbackSolution(HighsCallbackDataIn* data_in) {
1516+
HighsInt Highs_repairCallbackSolution(HighsCallbackDataIn* data_in) {
15171517
if (data_in != nullptr && data_in->cbdata != nullptr) {
15181518
HighsCallbackInput* obj = static_cast<HighsCallbackInput*>(data_in->cbdata);
15191519
return static_cast<int>(obj->repairSolution());

highs/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)