-
-
Notifications
You must be signed in to change notification settings - Fork 7
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #35 from lrineau/cgal-5.5.3
update v5.5.3
- Loading branch information
Showing
3 changed files
with
30 additions
and
2 deletions.
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,24 @@ | ||
diff --git a/Number_types/include/CGAL/boost_mp.h b/Number_types/include/CGAL/boost_mp.h | ||
index 3dcaadcad21..b98980acbc5 100644 | ||
--- a/Number_types/include/CGAL/boost_mp.h | ||
+++ b/Number_types/include/CGAL/boost_mp.h | ||
@@ -20,8 +20,18 @@ | ||
// easy solution. | ||
// MSVC had trouble with versions <= 1.69: | ||
// 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 && \ | ||
- (!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 | ||
|
||
#include <CGAL/Quotient.h> |