From 933e36190f417ffaed0a37dfa456ac1ffa940a3e Mon Sep 17 00:00:00 2001
From: Denis Chaplygin <denis.chaplygin@wolt.com>
Date: Wed, 2 Sep 2020 11:21:09 +0300
Subject: [PATCH] Removed catching of obsolete tbb:captured_exception, as TBB
 now supports C++ native std::exception_ptr inter-thread exception passing
 mechanism.

---
 include/updater/csv_file_parser.hpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/include/updater/csv_file_parser.hpp b/include/updater/csv_file_parser.hpp
index e0c7fabc0..1d746cdc0 100644
--- a/include/updater/csv_file_parser.hpp
+++ b/include/updater/csv_file_parser.hpp
@@ -17,6 +17,8 @@
 #include <boost/spirit/include/phoenix.hpp>
 #include <boost/spirit/include/qi.hpp>
 
+#include <exception>
+#include <stdexcept>
 #include <vector>
 
 namespace osrm
@@ -80,7 +82,9 @@ template <typename Key, typename Value> struct CSVFilesParser
 
             return LookupTable<Key, Value>{lookup};
         }
-        catch (const tbb::captured_exception &e)
+        catch (const std::exception &e)
+        // TBB should capture to std::exception_ptr and automatically rethrow in this thread.
+        // https://software.intel.com/en-us/node/506317
         {
             throw util::exception(e.what() + SOURCE_REF);
         }