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

Merge commit 'bb78bc8fe305eef39ca0a5d5e9dedc466f803dfb' into develop

Browse Source
This commit is contained in:
Dennis Luxen
2015-02-05 15:13:48 +01:00
parent 3eb83d0737 bb78bc8fe3
commit 10224a692b
215 changed files with 2699 additions and 1297 deletions
Download Patch File Download Diff File Expand all files Collapse all files
third_party/libosmium/include/osmium/thread/function_wrapper.hpp
Vendored
+3 -2
View File
@@ -5,7 +5,7 @@
This file is part of Osmium (http://osmcode.org/libosmium).
Copyright 2013,2014 Jochen Topf <jochen@topf.org> and others (see README).
Copyright 2013-2015 Jochen Topf <jochen@topf.org> and others (see README).
Boost Software License - Version 1.0 - August 17th, 2003
@@ -94,9 +94,10 @@ namespace osmium {
}
function_wrapper(const function_wrapper&) = delete;
function_wrapper(function_wrapper&) = delete;
function_wrapper& operator=(const function_wrapper&) = delete;
~function_wrapper() = default;
explicit operator bool() const {
return static_cast<bool>(impl);
}
third_party/libosmium/include/osmium/thread/pool.hpp
Vendored
+3 -3
View File
@@ -5,7 +5,7 @@
This file is part of Osmium (http://osmcode.org/libosmium).
Copyright 2013,2014 Jochen Topf <jochen@topf.org> and others (see README).
Copyright 2013-2015 Jochen Topf <jochen@topf.org> and others (see README).
Boost Software License - Version 1.0 - August 17th, 2003
@@ -160,11 +160,11 @@ namespace osmium {
}
template <typename TFunction>
std::future<typename std::result_of<TFunction()>::type> submit(TFunction f) {
std::future<typename std::result_of<TFunction()>::type> submit(TFunction&& func) {
typedef typename std::result_of<TFunction()>::type result_type;
std::packaged_task<result_type()> task(std::move(f));
std::packaged_task<result_type()> task(std::forward<TFunction>(func));
std::future<result_type> future_result(task.get_future());
m_work_queue.push(std::move(task));
third_party/libosmium/include/osmium/thread/queue.hpp
Vendored
+2 -1
View File
@@ -5,7 +5,7 @@
This file is part of Osmium (http://osmcode.org/libosmium).
Copyright 2013,2014 Jochen Topf <jochen@topf.org> and others (see README).
Copyright 2013-2015 Jochen Topf <jochen@topf.org> and others (see README).
Boost Software License - Version 1.0 - August 17th, 2003
@@ -39,6 +39,7 @@ DEALINGS IN THE SOFTWARE.
#include <cstddef>
#include <mutex>
#include <queue>
#include <string>
#include <thread>
#include <utility>
third_party/libosmium/include/osmium/thread/sorted_queue.hpp
Vendored
+1 -1
View File
@@ -5,7 +5,7 @@
This file is part of Osmium (http://osmcode.org/libosmium).
Copyright 2013,2014 Jochen Topf <jochen@topf.org> and others (see README).
Copyright 2013-2015 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
+1 -1
View File
@@ -5,7 +5,7 @@
This file is part of Osmium (http://osmcode.org/libosmium).
Copyright 2013,2014 Jochen Topf <jochen@topf.org> and others (see README).
Copyright 2013-2015 Jochen Topf <jochen@topf.org> and others (see README).
Boost Software License - Version 1.0 - August 17th, 2003