From cef4489d0fd77b155592fb50a89a261e7d1f14c8 Mon Sep 17 00:00:00 2001
From: Axel <axellopez92@outlook.com>
Date: Fri, 16 Dec 2022 12:36:39 +0100
Subject: [PATCH] Upgraded boost 1.81 for linux

---
 LibCarla/source/carla/Exception.cpp                   |  7 +++++++
 .../test/client/test_recurrent_shared_future.cpp      |  1 +
 Util/BuildTools/Setup.sh                              | 11 +----------
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/LibCarla/source/carla/Exception.cpp b/LibCarla/source/carla/Exception.cpp
index 7e340d4f8..1ed5c7965 100644
--- a/LibCarla/source/carla/Exception.cpp
+++ b/LibCarla/source/carla/Exception.cpp
@@ -5,6 +5,7 @@
 // For a copy, see <https://opensource.org/licenses/MIT>.
 
 #include "carla/Exception.h"
+#include <boost/assert/source_location.hpp>
 
 // =============================================================================
 // -- Define boost::throw_exception --------------------------------------------
@@ -18,6 +19,12 @@ namespace boost {
     carla::throw_exception(e);
   }
 
+  void throw_exception(
+      const std::exception &e,
+      boost::source_location const & loc) {
+    throw_exception(e);
+  }
+
 } // namespace boost
 
 #endif // BOOST_NO_EXCEPTIONS
diff --git a/LibCarla/source/test/client/test_recurrent_shared_future.cpp b/LibCarla/source/test/client/test_recurrent_shared_future.cpp
index c387ad6f7..ca452d7be 100644
--- a/LibCarla/source/test/client/test_recurrent_shared_future.cpp
+++ b/LibCarla/source/test/client/test_recurrent_shared_future.cpp
@@ -8,6 +8,7 @@
 
 #include <carla/RecurrentSharedFuture.h>
 #include <carla/ThreadGroup.h>
+#include <atomic>
 
 using namespace std::chrono_literals;
 
diff --git a/Util/BuildTools/Setup.sh b/Util/BuildTools/Setup.sh
index 35e8c88f9..7d521f879 100755
--- a/Util/BuildTools/Setup.sh
+++ b/Util/BuildTools/Setup.sh
@@ -118,7 +118,7 @@ unset LLVM_BASENAME
 # -- Get boost includes --------------------------------------------------------
 # ==============================================================================
 
-BOOST_VERSION=1.72.0
+BOOST_VERSION=1.81.0
 BOOST_BASENAME="boost-${BOOST_VERSION}-${CXX_TAG}"
 
 BOOST_INCLUDE=${PWD}/${BOOST_BASENAME}-install/include
@@ -154,10 +154,6 @@ for PY_VERSION in ${PY_VERSION_LIST[@]} ; do
     tar -xzf ${BOOST_PACKAGE_BASENAME}.tar.gz
     mkdir -p ${BOOST_BASENAME}-install/include
     mv ${BOOST_PACKAGE_BASENAME} ${BOOST_BASENAME}-source
-    # Boost patch for exception handling
-    cp "${CARLA_BUILD_FOLDER}/../Util/BoostFiles/rational.hpp" "${BOOST_BASENAME}-source/boost/rational.hpp"
-    cp "${CARLA_BUILD_FOLDER}/../Util/BoostFiles/read.hpp" "${BOOST_BASENAME}-source/boost/geometry/io/wkt/read.hpp"
-    # ---
 
     pushd ${BOOST_BASENAME}-source >/dev/null
 
@@ -187,11 +183,6 @@ for PY_VERSION in ${PY_VERSION_LIST[@]} ; do
     rm -Rf ${BOOST_BASENAME}-source
     rm ${BOOST_PACKAGE_BASENAME}.tar.gz
 
-    # Boost patch for exception handling
-    cp "${CARLA_BUILD_FOLDER}/../Util/BoostFiles/rational.hpp" "${BOOST_BASENAME}-install/include/boost/rational.hpp"
-    cp "${CARLA_BUILD_FOLDER}/../Util/BoostFiles/read.hpp" "${BOOST_BASENAME}-install/include/boost/geometry/io/wkt/read.hpp"
-    # ---
-
     # Install boost dependencies
     mkdir -p "${LIBCARLA_INSTALL_CLIENT_FOLDER}/include/system"
     mkdir -p "${LIBCARLA_INSTALL_CLIENT_FOLDER}/lib"