Open-Harbor/osrm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

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

Browse Source
This commit is contained in:
Denis Chaplygin 2020-09-02 11:21:09 +03:00
parent 03d9e7a8ce
commit 933e36190f
No known key found for this signature in database
GPG Key ID: 20B3EDF942F8C943
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/updater/csv_file_parser.hpp
View File

@ -17,6 +17,8 @@
#include <boost/spirit/include/phoenix.hpp> #include <boost/spirit/include/phoenix.hpp>
#include <boost/spirit/include/qi.hpp> #include <boost/spirit/include/qi.hpp>
#include <exception>
#include <stdexcept>
#include <vector> #include <vector>
namespace osrm namespace osrm
@ -80,7 +82,9 @@ template <typename Key, typename Value> struct CSVFilesParser
return LookupTable<Key, Value>{lookup}; 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); throw util::exception(e.what() + SOURCE_REF);
} }