Removed catching of obsolete tbb:captured_exception, as TBB now supports C++ native std::exception_ptr inter-thread exception passing mechanism.
This commit is contained in:
parent
03d9e7a8ce
commit
933e36190f
@ -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);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user