songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

sync with master@ec9de37b61

This commit is contained in:
Sébastien Loriot 2024-02-27 11:23:10 +01:00
parent 5ad84b06b6
commit f802557b7b
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Number_types/include/CGAL/Number_types/internal/Exact_type_selector.h
View File

@ -23,8 +23,8 @@
#include <CGAL/MP_Float.h> #include <CGAL/MP_Float.h>
#include <CGAL/Quotient.h> #include <CGAL/Quotient.h>
#include <CGAL/boost_mp.h> #include <CGAL/cpp_float.h>
# include <CGAL/cpp_float.h>
#ifdef CGAL_USE_GMP #ifdef CGAL_USE_GMP
# include <CGAL/Gmpz.h> # include <CGAL/Gmpz.h>
# include <CGAL/Gmpq.h> # include <CGAL/Gmpq.h>

12
Number_types/include/CGAL/boost_mp_type.h
View File

@ -20,8 +20,18 @@
// easy solution. // easy solution.
// MSVC had trouble with versions <= 1.69: // MSVC had trouble with versions <= 1.69:
// https://github.com/boostorg/multiprecision/issues/98 // https://github.com/boostorg/multiprecision/issues/98
//
// Disable also on Windows 32 bits
// because CGAL/cpp_float.h assumes _BitScanForward64 is available
// See https://learn.microsoft.com/en-us/cpp/intrinsics/bitscanforward-bitscanforward64
//
// Disable also with PowerPC processors, with Boost<1.80 because of that bug:
// https://github.com/boostorg/multiprecision/pull/421
//
#if !defined CGAL_DO_NOT_USE_BOOST_MP && \ #if !defined CGAL_DO_NOT_USE_BOOST_MP && \
(!defined _MSC_VER || BOOST_VERSION >= 107000) (!defined _MSC_VER || BOOST_VERSION >= 107000) && \
(!defined _WIN32 || defined _WIN64) && \
(BOOST_VERSION >= 108000 || (!defined _ARCH_PPC && !defined _ARCH_PPC64))
#define CGAL_USE_BOOST_MP 1 #define CGAL_USE_BOOST_MP 1
#include <CGAL/Quotient.h> #include <CGAL/Quotient.h>