Merge pull request #148 from Oslandia/fix_145

Fix build when CGAL is compiled with GMPXX
Oslandia · Nov 13, 2017 · 5499795 · 5499795
2 parents 46557e0 + 5c495ce
commit 5499795
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 0 deletions.
diff --git a/src/Coordinate.cpp b/src/Coordinate.cpp
@@ -266,10 +266,17 @@ class RoundVisitor : public boost::static_visitor<> {
 
 
     Kernel::FT _roundFT( const Kernel::FT& v ) const {
+        #ifdef CGAL_USE_GMPXX
+        return Kernel::FT( ::mpq_class(
+                               SFCGAL::round( v.exact() * _scaleFactor ),
+                               _scaleFactor
+                           ) ) ;
+        #else
         return Kernel::FT( CGAL::Gmpq(
                                SFCGAL::round( v.exact() * _scaleFactor ),
                                _scaleFactor
                            ) ) ;
+        #endif
     }
 
 };

diff --git a/src/numeric.h b/src/numeric.h
@@ -57,6 +57,20 @@ inline double round( const double& v )
     }
 }
 
+#ifdef CGAL_USE_GMPXX
+/**
+ * @brief floor a rational to an integer
+ */
+SFCGAL_API ::mpz_class floor( const ::mpq_class& v ) ;
+/**
+ * @brief ceil a rational to an integer
+ */
+SFCGAL_API ::mpz_class ceil( const ::mpq_class& v ) ;
+/**
+ * @brief round a rational to an integer
+ */
+SFCGAL_API ::mpz_class round( const ::mpq_class& v ) ;
+#endif
 
 /**
  * @brief floor a rational to an integer