diff --git a/src/Coordinate.cpp b/src/Coordinate.cpp index 6e40fb5a..17bfa73a 100644 --- a/src/Coordinate.cpp +++ b/src/Coordinate.cpp @@ -32,6 +32,7 @@ Coordinate::Coordinate(const Kernel::FT &x, const Kernel::FT &y, { } + /// /// /// @@ -252,7 +253,8 @@ class RoundVisitor : public boost::static_visitor<> { [[nodiscard]] auto _roundFT(const Kernel::FT &v) const -> Kernel::FT { -#ifdef CGAL_USE_GMPXX + +#if defined(CGAL_USE_GMPXX) ::mpq_class q(SFCGAL::round(v.exact() * _scaleFactor), _scaleFactor); q.canonicalize(); return Kernel::FT(q); @@ -260,6 +262,7 @@ class RoundVisitor : public boost::static_visitor<> { return Kernel::FT( CGAL::Gmpq(SFCGAL::round(v.exact() * _scaleFactor), _scaleFactor)); #endif + } }; diff --git a/src/Coordinate.h b/src/Coordinate.h index 458bf5f7..16f08ce9 100644 --- a/src/Coordinate.h +++ b/src/Coordinate.h @@ -28,6 +28,7 @@ class SFCGAL_API Coordinate { * Empty Coordinate constructor */ Coordinate(); + /** * XY Constructor with exact coordinates */ @@ -36,6 +37,7 @@ class SFCGAL_API Coordinate { * XYZ Constructor with exact coordinates */ Coordinate(const Kernel::FT &x, const Kernel::FT &y, const Kernel::FT &z); + /** * XYZ constructor * @warning x,y,z must not be not be NaN nor inf diff --git a/src/Kernel.h b/src/Kernel.h index c04a9d3e..05ab7633 100644 --- a/src/Kernel.h +++ b/src/Kernel.h @@ -12,7 +12,8 @@ namespace SFCGAL { /** * default Kernel */ -typedef CGAL::Exact_predicates_exact_constructions_kernel Kernel; + +using Kernel = CGAL::Exact_predicates_exact_constructions_kernel; /** * Quotient type diff --git a/src/detail/Interval.cpp b/src/detail/Interval.cpp index abd2f84d..58aecdb3 100644 --- a/src/detail/Interval.cpp +++ b/src/detail/Interval.cpp @@ -43,7 +43,7 @@ Interval::operator=(const Interval &other) -> Interval & = default; /// /// /// -Interval::~Interval() = default; + /// /// diff --git a/src/detail/Interval.h b/src/detail/Interval.h index cf425bde..a7c23b13 100644 --- a/src/detail/Interval.h +++ b/src/detail/Interval.h @@ -36,10 +36,6 @@ class SFCGAL_API Interval { */ Interval & operator=(const Interval &other); - /** - * destructor - */ - ~Interval(); /** * indicates if the interval is empty diff --git a/src/detail/transform/ForceZ.cpp b/src/detail/transform/ForceZ.cpp index d557ebb4..2a7cb1e5 100644 --- a/src/detail/transform/ForceZ.cpp +++ b/src/detail/transform/ForceZ.cpp @@ -12,7 +12,7 @@ namespace SFCGAL::transform { /// /// /// -ForceZ::ForceZ(Kernel::FT defaultZ) : _defaultZ(std::move(defaultZ)) {} +ForceZ::ForceZ(Kernel::FT defaultZ) : _defaultZ(defaultZ) {} /// /// diff --git a/src/detail/transform/ForceZOrderPoints.cpp b/src/detail/transform/ForceZOrderPoints.cpp index 3c97bcc1..dff7497a 100644 --- a/src/detail/transform/ForceZOrderPoints.cpp +++ b/src/detail/transform/ForceZOrderPoints.cpp @@ -16,7 +16,7 @@ namespace SFCGAL::transform { /// /// ForceZOrderPoints::ForceZOrderPoints(Kernel::FT defaultZ) - : _defaultZ(std::move(defaultZ)) + : _defaultZ(defaultZ) { } diff --git a/src/numeric.h b/src/numeric.h index 3aaa6d96..da7494aa 100644 --- a/src/numeric.h +++ b/src/numeric.h @@ -63,6 +63,7 @@ almostEqual(const Kernel::FT &a, const Kernel::FT &b, const Kernel::FT &epsilon) return diff <= epsilon * std::max(absA, absB); // adaptative epsilon } + #if defined(__clang__) #pragma clang diagnostic pop #elif defined(__GCC__)