From 9ceb26c212932fa125c331a768166347fc73a83c Mon Sep 17 00:00:00 2001
From: Fernando Pelliccioni <fpelliccioni@gmail.com>
Date: Wed, 28 Sep 2022 10:38:08 +0200
Subject: [PATCH 1/2] Fix name conflict with boost math in Boost <= 1.76

---
 test/executor_test.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/test/executor_test.cpp b/test/executor_test.cpp
index 4bd602983..630a181b1 100644
--- a/test/executor_test.cpp
+++ b/test/executor_test.cpp
@@ -20,7 +20,7 @@
 using namespace stlab;
 using namespace std;
 
-namespace mp = boost::multiprecision;
+namespace mpre = boost::multiprecision;
 
 namespace {
 void rest() { std::this_thread::sleep_for(std::chrono::milliseconds(1)); }
@@ -232,7 +232,7 @@ struct check_task {
 
         _correctScheduleCount += schedule_increment<P>();
 
-        fibonacci<mp::cpp_int>(fiboN);
+        fibonacci<mpre::cpp_int>(fiboN);
 
         switch (workToDo % 3) {
             case 0:
@@ -299,17 +299,17 @@ BOOST_AUTO_TEST_CASE(MeasureTiming) {
     for (auto i = 0; i < iterations; ++i) {
         low_executor([_i = i, &results, &counter] {
             results[_i] = 1;
-            fibonacci<mp::cpp_int>(fiboN);
+            fibonacci<mpre::cpp_int>(fiboN);
             ++counter;
         });
         default_executor([_i = i + iterations, &results, &counter] {
             results[_i] = 2;
-            fibonacci<mp::cpp_int>(fiboN);
+            fibonacci<mpre::cpp_int>(fiboN);
             ++counter;
         });
         high_executor([_i = i + iterations * 2, &results, &counter] {
             results[_i] = 3;
-            fibonacci<mp::cpp_int>(fiboN);
+            fibonacci<mpre::cpp_int>(fiboN);
             ++counter;
         });
     }

From 31e2703030d93a43e5b3a787b8054ff21fdd310e Mon Sep 17 00:00:00 2001
From: Fernando Pelliccioni <fpelliccioni@gmail.com>
Date: Fri, 30 Sep 2022 23:04:01 +0200
Subject: [PATCH 2/2] Update test/executor_test.cpp

Co-authored-by: David Sankel <camior@gmail.com>
---
 test/executor_test.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/executor_test.cpp b/test/executor_test.cpp
index 630a181b1..46bd559bc 100644
--- a/test/executor_test.cpp
+++ b/test/executor_test.cpp
@@ -20,6 +20,7 @@
 using namespace stlab;
 using namespace std;
 
+// Use 'mpre' instead of 'mp' because the latter conflicts with Boost.Math <= 1.76
 namespace mpre = boost::multiprecision;
 
 namespace {