Skip to content

Commit f5d43f1

Browse files
authored
Merge pull request #2344 from ERGO-Code/fix-warnings
fix compiler warnings from HiGHS 1.10.0
2 parents 146aa59 + 2200b6f commit f5d43f1

File tree

4 files changed

+19
-11
lines changed

4 files changed

+19
-11
lines changed

highs/lp_data/HighsInterface.cpp

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -674,10 +674,10 @@ HighsStatus Highs::addRowsInterface(HighsInt ext_num_new_row,
674674
return return_status;
675675
}
676676

677-
void deleteBasisEntries(std::vector<HighsBasisStatus>& status,
678-
bool& deleted_basic, bool& deleted_nonbasic,
679-
const HighsIndexCollection& index_collection,
680-
const HighsInt entry_dim) {
677+
static void deleteBasisEntries(std::vector<HighsBasisStatus>& status,
678+
bool& deleted_basic, bool& deleted_nonbasic,
679+
const HighsIndexCollection& index_collection,
680+
const HighsInt entry_dim) {
681681
assert(ok(index_collection));
682682
assert(static_cast<size_t>(entry_dim) == status.size());
683683
HighsInt from_k;
@@ -717,19 +717,19 @@ void deleteBasisEntries(std::vector<HighsBasisStatus>& status,
717717
status.resize(new_num_entry);
718718
}
719719

720-
void deleteBasisCols(HighsBasis& basis,
721-
const HighsIndexCollection& index_collection,
722-
const HighsInt original_num_col) {
720+
static void deleteBasisCols(HighsBasis& basis,
721+
const HighsIndexCollection& index_collection,
722+
const HighsInt original_num_col) {
723723
bool deleted_basic;
724724
bool deleted_nonbasic;
725725
deleteBasisEntries(basis.col_status, deleted_basic, deleted_nonbasic,
726726
index_collection, original_num_col);
727727
if (deleted_basic) basis.valid = false;
728728
}
729729

730-
void deleteBasisRows(HighsBasis& basis,
731-
const HighsIndexCollection& index_collection,
732-
const HighsInt original_num_row) {
730+
static void deleteBasisRows(HighsBasis& basis,
731+
const HighsIndexCollection& index_collection,
732+
const HighsInt original_num_row) {
733733
bool deleted_basic;
734734
bool deleted_nonbasic;
735735
deleteBasisEntries(basis.row_status, deleted_basic, deleted_nonbasic,

highs/mip/HighsMipSolverData.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1806,7 +1806,7 @@ HighsLpRelaxation::Status HighsMipSolverData::evaluateRootLp() {
18061806
} while (true);
18071807
}
18081808

1809-
void clockOff(HighsMipAnalysis& analysis) {
1809+
static void clockOff(HighsMipAnalysis& analysis) {
18101810
if (!analysis.analyse_mip_time) return;
18111811
// Make sure that exactly one of the following clocks is running
18121812
const int clock0_running =

highs/pdlp/CupdlpWrapper.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,12 @@ cupdlp_retcode data_alloc(CUPDLPdata* data, cupdlp_int nRows, cupdlp_int nCols,
7979

8080
double infNorm(double* x, cupdlp_int n);
8181

82+
void cupdlp_hasLower(cupdlp_float *haslb, const cupdlp_float *lb,
83+
const cupdlp_float bound, const cupdlp_int len);
84+
85+
void cupdlp_hasUpper(cupdlp_float *hasub, const cupdlp_float *ub,
86+
const cupdlp_float bound, const cupdlp_int len);
87+
8288
void cupdlp_haslb(cupdlp_float* haslb, const cupdlp_float* lb,
8389
const cupdlp_float bound, const cupdlp_int len);
8490

highs/util/HighsTimer.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ class HighsTimer {
4545
num_clock = 0;
4646
HighsInt i_clock = clock_def("Run HiGHS");
4747
assert(i_clock == 0);
48+
(void)i_clock;
4849

4950
presolve_clock = clock_def("Presolve");
5051
solve_clock = clock_def("Solve");
@@ -102,6 +103,7 @@ class HighsTimer {
102103
this->clock_names.clear();
103104
HighsInt i_clock = clock_def("Run HiGHS");
104105
assert(i_clock == 0);
106+
(void)i_clock;
105107
this->presolve_clock = clock_def("Presolve");
106108
this->solve_clock = clock_def("Solve");
107109
this->postsolve_clock = clock_def("Postsolve");

0 commit comments

Comments
 (0)