Removed catching of obsolete tbb:captured_exception, as TBB now supports C++ native std::exception_ptr inter-thread exception passing mechanism.

Denis Chaplygin · Denis Chaplygin · commit 933e36190f41 · 2020-09-04T09:33:43.000+03:00
diff --git 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);
         }

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,8 @@`
`17`	`17`	`#include <boost/spirit/include/phoenix.hpp>`
`18`	`18`	`#include <boost/spirit/include/qi.hpp>`
`19`	`19`
	`20`	`+#include <exception>`
	`21`	`+#include <stdexcept>`
`20`	`22`	`#include <vector>`
`21`	`23`
`22`	`24`	`namespace osrm`
`@@ -80,7 +82,9 @@ template <typename Key, typename Value> struct CSVFilesParser`
`80`	`82`
`81`	`83`	`return LookupTable<Key, Value>{lookup};`
`82`	`84`	`}`
`83`		`- catch (const tbb::captured_exception &e)`
	`85`	`+ catch (const std::exception &e)`
	`86`	`+ // TBB should capture to std::exception_ptr and automatically rethrow in this thread.`
	`87`	`+ // https://software.intel.com/en-us/node/506317`
`84`	`88`	`{`
`85`	`89`	`throw util::exception(e.what() + SOURCE_REF);`
`86`	`90`	`}`