diff --git a/src/core/domains/codac2_Domain.h b/src/core/domains/codac2_Domain.h index f7827d96e..77d0fb63b 100644 --- a/src/core/domains/codac2_Domain.h +++ b/src/core/domains/codac2_Domain.h @@ -62,7 +62,7 @@ namespace codac2 }; template - static double total_volume(const X&... x) + inline double total_volume(const X&... x) { double v = 0; ((v += x.volume()), ...); diff --git a/src/core/domains/tube/codac2_TDomain.cpp b/src/core/domains/tube/codac2_TDomain.cpp index 3d6260949..16281ed98 100644 --- a/src/core/domains/tube/codac2_TDomain.cpp +++ b/src/core/domains/tube/codac2_TDomain.cpp @@ -244,7 +244,7 @@ namespace codac2 list::const_iterator it1 = tdom1->cbegin(), it2 = tdom2->cbegin(); while(it1 != tdom1->cend()) { - if(*it1 != *it2) return false; + if(!((*it1) == (*it2))) return false; it1++; it2++; } return true; diff --git a/src/core/domains/tube/codac2_TSlice.cpp b/src/core/domains/tube/codac2_TSlice.cpp index 0377e24ad..97410e475 100644 --- a/src/core/domains/tube/codac2_TSlice.cpp +++ b/src/core/domains/tube/codac2_TSlice.cpp @@ -35,4 +35,6 @@ namespace codac2 { return _slices; } + + TSlice::~TSlice() = default; } \ No newline at end of file diff --git a/src/core/domains/tube/codac2_TSlice.h b/src/core/domains/tube/codac2_TSlice.h index 81edf9c59..0d4d2d445 100644 --- a/src/core/domains/tube/codac2_TSlice.h +++ b/src/core/domains/tube/codac2_TSlice.h @@ -75,6 +75,12 @@ namespace codac2 using Interval::operator==; + bool operator==(const TSlice& x) const { + return Interval::operator==(x); + } + + ~TSlice() override; + protected: /** diff --git a/src/core/functions/analytic/codac2_analytic_flat_input_layout.h b/src/core/functions/analytic/codac2_analytic_flat_input_layout.h index 7bc5622d0..2d515e03b 100644 --- a/src/core/functions/analytic/codac2_analytic_flat_input_layout.h +++ b/src/core/functions/analytic/codac2_analytic_flat_input_layout.h @@ -174,7 +174,7 @@ namespace codac2 }; template - static std::shared_ptr as_expr_base(const AnalyticExprWrapper& e) + inline std::shared_ptr as_expr_base(const AnalyticExprWrapper& e) { return std::static_pointer_cast( std::shared_ptr>(e) diff --git a/src/core/paver/codac2_pave.cpp b/src/core/paver/codac2_pave.cpp index c2d4cabad..29e8b01e7 100644 --- a/src/core/paver/codac2_pave.cpp +++ b/src/core/paver/codac2_pave.cpp @@ -75,7 +75,7 @@ namespace codac2 time = (double)(clock()-t_start)/CLOCKS_PER_SEC; if(verbose) - printf("Computation time: %.4fs, %ld boxes\n", time, n_boundary); + printf("Computation time: %.4fs, %td boxes\n", time, n_boundary); return p; } diff --git a/src/graphics/figures/codac2_Figure2D_pave.h b/src/graphics/figures/codac2_Figure2D_pave.h index 17d4c34c4..93f07e542 100644 --- a/src/graphics/figures/codac2_Figure2D_pave.h +++ b/src/graphics/figures/codac2_Figure2D_pave.h @@ -70,7 +70,7 @@ namespace codac2 } } - printf("Computation time: %.4fs, %ld boxes\n", (double)(clock()-t_start)/CLOCKS_PER_SEC, n); + printf("Computation time: %.4fs, %td boxes\n", (double)(clock()-t_start)/CLOCKS_PER_SEC, n); } template