From 75a94781d566f3b9606577974b40d8da0f4b2153 Mon Sep 17 00:00:00 2001
From: joaquintides <joaquin.lopezmunoz@gmail.com>
Date: Sat, 30 Dec 2023 22:11:11 +0100
Subject: [PATCH] Fix/b2 5.0.0 (#228)

updated CI after b2 5.0.0 new requirements on the compiler used for self-build
---
 .drone.jsonnet             | 10 +++++-----
 test/cfoa/insert_tests.cpp | 14 +++++++++-----
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/.drone.jsonnet b/.drone.jsonnet
index 7386d337..154007f9 100644
--- a/.drone.jsonnet
+++ b/.drone.jsonnet
@@ -102,16 +102,16 @@ local windows_pipeline(name, image, environment, arch = "amd64") =
 [
     linux_pipeline(
         "Linux 14.04 GCC 4.8* 32/64",
-        "cppalliance/droneubuntu1404:1",
-        { TOOLSET: 'gcc', COMPILER: 'g++', CXXSTD: '11', ADDRMD: '32,64' },
+        "cppalliance/droneubuntu1604:1",
+        { TOOLSET: 'gcc', COMPILER: 'g++-4.8', CXXSTD: '11', ADDRMD: '32,64' },
+        "g++-4.8-multilib",
     ),
 
     linux_pipeline(
         "Linux 14.04 GCC 4.9 32/64",
-        "cppalliance/droneubuntu1404:1",
+        "cppalliance/droneubuntu1604:1",
         { TOOLSET: 'gcc', COMPILER: 'g++-4.9', CXXSTD: '11', ADDRMD: '32,64' },
         "g++-4.9-multilib",
-        [ "ppa:ubuntu-toolchain-r/test" ],
     ),
 
     linux_pipeline(
@@ -468,7 +468,7 @@ local windows_pipeline(name, image, environment, arch = "amd64") =
     windows_pipeline(
         "Windows VS2015 msvc-14.0",
         "cppalliance/dronevs2015",
-        { TOOLSET: 'msvc-14.0', CXXSTD: '14,latest' },
+        { TOOLSET: 'msvc-14.0', CXXSTD: '14,latest', 'B2_DONT_EMBED_MANIFEST': 1 },
     ),
 
     windows_pipeline(
diff --git a/test/cfoa/insert_tests.cpp b/test/cfoa/insert_tests.cpp
index 3350c691..8f1f3933 100644
--- a/test/cfoa/insert_tests.cpp
+++ b/test/cfoa/insert_tests.cpp
@@ -159,7 +159,7 @@ namespace {
 #elif BOOST_WORKAROUND(BOOST_GCC_VERSION, >= 40900) && \
       BOOST_WORKAROUND(BOOST_GCC_VERSION, <  50000)
       // seemingly same problem, though the snippet above does not reveal it
-#else      
+#else
       BOOST_TEST_EQ(raii::copy_constructor, 0u);
 #endif
       BOOST_TEST_EQ(raii::copy_assignment, 0u);
@@ -491,8 +491,10 @@ namespace {
 
       BOOST_TEST_EQ(
         raii::default_constructor, value_type_cardinality * values2.size());
-#if BOOST_WORKAROUND(BOOST_GCC_VERSION, >= 50300) && \
-    BOOST_WORKAROUND(BOOST_GCC_VERSION, <  50500)
+#if (BOOST_WORKAROUND(BOOST_GCC_VERSION, >= 50300) && \
+     BOOST_WORKAROUND(BOOST_GCC_VERSION, <  50500)) || \
+    (BOOST_WORKAROUND(BOOST_GCC_VERSION, >= 40900) && \
+     BOOST_WORKAROUND(BOOST_GCC_VERSION, <  50000))
       // skip test
 #else
       BOOST_TEST_EQ(raii::copy_constructor, 0u);
@@ -528,8 +530,10 @@ namespace {
 
       BOOST_TEST_EQ(
         raii::default_constructor, value_type_cardinality * values2.size());
-#if BOOST_WORKAROUND(BOOST_GCC_VERSION, >= 50300) && \
-    BOOST_WORKAROUND(BOOST_GCC_VERSION, <  50500)
+#if (BOOST_WORKAROUND(BOOST_GCC_VERSION, >= 50300) && \
+     BOOST_WORKAROUND(BOOST_GCC_VERSION, <  50500)) || \
+    (BOOST_WORKAROUND(BOOST_GCC_VERSION, >= 40900) && \
+     BOOST_WORKAROUND(BOOST_GCC_VERSION, <  50000))
       // skip test
 #else
       BOOST_TEST_EQ(raii::copy_constructor, 0u);