Skip to content

Commit 1703e69

Browse files
committed
Fix ambiguous call to pow for clang, and disable LoadableBlasLib
1 parent f8db05c commit 1703e69

File tree

3 files changed

+3
-2
lines changed

3 files changed

+3
-2
lines changed

external/cmake-files/LPSolve.cmake

+1
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ function(GetLPSolve)
3434
add_compile_options(-DLoadLanguageLib=0)
3535
add_compile_definitions(RoleIsExternalInvEngine)
3636
add_compile_definitions(INVERSE_ACTIVE=3)
37+
add_compile_options(-DLoadableBlasLib=0)
3738

3839
include_directories (BEFORE ${LP_SOLVE_DIR})
3940
include_directories (BEFORE ${LP_SOLVE_DIR}/bfp)

include/diagnostics/effective_sample_size.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ VT effective_sample_size(MT const& samples, unsigned int &min_ess) {
6868
variance = NT(0);
6969

7070
for (int j = 0; j < N; j++) {
71-
variance += pow(normalized_sample_row[j], 2);
71+
variance += std::pow(normalized_sample_row[j], 2);
7272
}
7373

7474
variance *= (1.0 / N);

include/diagnostics/print_diagnostics.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ void print_diagnostics(MT const& samples, unsigned int &min_ess, StreamType &str
4242
row_mean = samples.row(i).mean();
4343
row_std = NT(0);
4444
for (int j = 0; j < N; j++) {
45-
row_std += pow(samples(i, j) - row_mean, 2);
45+
row_std += std::pow(samples(i, j) - row_mean, 2);
4646
}
4747
row_std = sqrt(row_std / N);
4848
vt.addRow(i + 1, row_mean, row_std, ess(i), intv_psrf(i));

0 commit comments

Comments
 (0)