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

Upgrade libosmium to v2.15.6

Browse Source
This commit is contained in:
Desone Burns II
2020-11-17 14:59:06 -07:00
parent 98fd17589d
commit dfc1bfc27e
319 changed files with 6268 additions and 3946 deletions
Download Patch File Download Diff File Expand all files Collapse all files
third_party/libosmium/include/osmium/thread/function_wrapper.hpp
Vendored
+5 -4
View File
@@ -3,9 +3,9 @@
/*
This file is part of Osmium (http://osmcode.org/libosmium).
This file is part of Osmium (https://osmcode.org/libosmium).
Copyright 2013-2018 Jochen Topf <jochen@topf.org> and others (see README).
Copyright 2013-2020 Jochen Topf <jochen@topf.org> and others (see README).
Boost Software License - Version 1.0 - August 17th, 2003
@@ -87,9 +87,10 @@ namespace osmium {
// Constructor must not be "explicit" for wrapper
// to work seemlessly.
template <typename TFunction>
template <typename TFunction, typename X = typename std::enable_if<
!std::is_same<TFunction, function_wrapper>::value, void>::type>
// cppcheck-suppress noExplicitConstructor
function_wrapper(TFunction&& f) : // NOLINT(google-explicit-constructor, hicpp-explicit-conversions, misc-forwarding-reference-overload)
function_wrapper(TFunction&& f) : // NOLINT(google-explicit-constructor, hicpp-explicit-conversions)
impl(new impl_type<TFunction>(std::forward<TFunction>(f))) {
}
third_party/libosmium/include/osmium/thread/pool.hpp
Vendored
+13 -7
View File
@@ -3,9 +3,9 @@
/*
This file is part of Osmium (http://osmcode.org/libosmium).
This file is part of Osmium (https://osmcode.org/libosmium).
Copyright 2013-2018 Jochen Topf <jochen@topf.org> and others (see README).
Copyright 2013-2020 Jochen Topf <jochen@topf.org> and others (see README).
Boost Software License - Version 1.0 - August 17th, 2003
@@ -56,7 +56,9 @@ namespace osmium {
// Maximum number of allowed pool threads (just to keep the user
// from setting something silly).
constexpr const int max_pool_threads = 32;
enum {
max_pool_threads = 32
};
inline int get_pool_size(int num_threads, int user_setting, unsigned hardware_concurrency) {
if (num_threads == 0) {
@@ -77,8 +79,7 @@ namespace osmium {
}
inline std::size_t get_work_queue_size() noexcept {
const std::size_t n = osmium::config::get_max_queue_size("WORK", 10);
return n > 2 ? n : 2;
return osmium::config::get_max_queue_size("WORK", 10);
}
} // namespace detail
@@ -138,8 +139,13 @@ namespace osmium {
public:
static constexpr int default_num_threads = 0;
static constexpr int default_queue_size = 0;
enum {
default_num_threads = 0
};
enum {
default_queue_size = 0U
};
/**
* Create thread pool with the given number of threads. If
third_party/libosmium/include/osmium/thread/queue.hpp
Vendored
+2 -2
View File
@@ -3,9 +3,9 @@
/*
This file is part of Osmium (http://osmcode.org/libosmium).
This file is part of Osmium (https://osmcode.org/libosmium).
Copyright 2013-2018 Jochen Topf <jochen@topf.org> and others (see README).
Copyright 2013-2020 Jochen Topf <jochen@topf.org> and others (see README).
Boost Software License - Version 1.0 - August 17th, 2003
third_party/libosmium/include/osmium/thread/util.hpp
Vendored
+2 -2
View File
@@ -3,9 +3,9 @@
/*
This file is part of Osmium (http://osmcode.org/libosmium).
This file is part of Osmium (https://osmcode.org/libosmium).
Copyright 2013-2018 Jochen Topf <jochen@topf.org> and others (see README).
Copyright 2013-2020 Jochen Topf <jochen@topf.org> and others (see README).
Boost Software License - Version 1.0 - August 17th, 2003