Skip to content

Commit

Permalink
Merge pull request #14320 from tamiko/fix-cgal-clang
Browse files Browse the repository at this point in the history
CGAL: use dealii's constexpr Utilities::pow instead of std::pow
  • Loading branch information
kronbichler committed Sep 28, 2022
2 parents b533f29 + ecb1a1a commit 37943f4
Showing 1 changed file with 7 additions and 6 deletions.
13 changes: 7 additions & 6 deletions source/cgal/intersections.cc
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
#ifdef DEAL_II_WITH_CGAL

# include <deal.II/base/quadrature_lib.h>
# include <deal.II/base/utilities.h>

# include <deal.II/fe/mapping.h>

Expand Down Expand Up @@ -716,19 +717,19 @@ namespace CGALWrappers
ExcNotImplemented());

const auto vertices0 =
CGALWrappers::get_vertices_in_cgal_order<int(std::pow(2, dim0))>(
CGALWrappers::get_vertices_in_cgal_order<Utilities::pow(2, dim0)>(
cell0, mapping0);
const auto vertices1 =
CGALWrappers::get_vertices_in_cgal_order<int(std::pow(2, dim1))>(
CGALWrappers::get_vertices_in_cgal_order<Utilities::pow(2, dim1)>(
cell1, mapping1);

return compute_intersection_of_cells<dim0,
dim1,
spacedim,
int(std::pow(2, dim0)),
int(std::pow(2, dim1))>(vertices0,
vertices1,
tol);
Utilities::pow(2, dim0),
Utilities::pow(2, dim1)>(vertices0,
vertices1,
tol);
}

# include "intersections.inst"
Expand Down

0 comments on commit 37943f4

Please sign in to comment.