Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/core/domains/codac2_Domain.h
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ namespace codac2
};

template<typename... X>
static double total_volume(const X&... x)
inline double total_volume(const X&... x)
{
double v = 0;
((v += x.volume()), ...);
Expand Down
2 changes: 1 addition & 1 deletion src/core/domains/tube/codac2_TDomain.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ namespace codac2
list<TSlice>::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;
Expand Down
2 changes: 2 additions & 0 deletions src/core/domains/tube/codac2_TSlice.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,6 @@ namespace codac2
{
return _slices;
}

TSlice::~TSlice() = default;
}
6 changes: 6 additions & 0 deletions src/core/domains/tube/codac2_TSlice.h
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,12 @@ namespace codac2

using Interval::operator==;

bool operator==(const TSlice& x) const {
return Interval::operator==(x);
}

~TSlice() override;

protected:

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ namespace codac2
};

template<typename T>
static std::shared_ptr<ExprBase> as_expr_base(const AnalyticExprWrapper<T>& e)
inline std::shared_ptr<ExprBase> as_expr_base(const AnalyticExprWrapper<T>& e)
{
return std::static_pointer_cast<ExprBase>(
std::shared_ptr<AnalyticExpr<T>>(e)
Expand Down
2 changes: 1 addition & 1 deletion src/core/paver/codac2_pave.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
2 changes: 1 addition & 1 deletion src/graphics/figures/codac2_Figure2D_pave.h
Original file line number Diff line number Diff line change
Expand Up @@ -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<typename C>
Expand Down
Loading