pull in latest osmcode/libosmium changes
This commit is contained in:
+1
-1
@@ -128,7 +128,7 @@ namespace osmium {
|
||||
}
|
||||
|
||||
try {
|
||||
for (int i=0; i < m_num_threads; ++i) {
|
||||
for (int i = 0; i < m_num_threads; ++i) {
|
||||
m_threads.push_back(std::thread(&Pool::worker_thread, this));
|
||||
}
|
||||
} catch (...) {
|
||||
|
||||
+4
-4
@@ -49,7 +49,7 @@ namespace osmium {
|
||||
|
||||
namespace thread {
|
||||
|
||||
OSMIUM_CONSTEXPR std::chrono::milliseconds full_queue_sleep_duration { 10 }; // XXX
|
||||
static const std::chrono::milliseconds full_queue_sleep_duration { 10 }; // XXX
|
||||
|
||||
/**
|
||||
* A thread-safe queue.
|
||||
@@ -137,7 +137,7 @@ namespace osmium {
|
||||
m_data_available.wait(lock, [this] {
|
||||
return !m_queue.empty();
|
||||
});
|
||||
value=std::move(m_queue.front());
|
||||
value = std::move(m_queue.front());
|
||||
m_queue.pop();
|
||||
}
|
||||
|
||||
@@ -148,7 +148,7 @@ namespace osmium {
|
||||
})) {
|
||||
return;
|
||||
}
|
||||
value=std::move(m_queue.front());
|
||||
value = std::move(m_queue.front());
|
||||
m_queue.pop();
|
||||
}
|
||||
|
||||
@@ -157,7 +157,7 @@ namespace osmium {
|
||||
if (m_queue.empty()) {
|
||||
return false;
|
||||
}
|
||||
value=std::move(m_queue.front());
|
||||
value = std::move(m_queue.front());
|
||||
m_queue.pop();
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -107,7 +107,7 @@ namespace osmium {
|
||||
m_data_available.wait(lock, [this] {
|
||||
return !empty_intern();
|
||||
});
|
||||
value=std::move(m_queue.front());
|
||||
value = std::move(m_queue.front());
|
||||
m_queue.pop_front();
|
||||
++m_offset;
|
||||
}
|
||||
@@ -122,7 +122,7 @@ namespace osmium {
|
||||
if (empty_intern()) {
|
||||
return false;
|
||||
}
|
||||
value=std::move(m_queue.front());
|
||||
value = std::move(m_queue.front());
|
||||
m_queue.pop_front();
|
||||
++m_offset;
|
||||
return true;
|
||||
|
||||
Reference in New Issue
Block a user