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

bump osmium version

Browse Source
This commit is contained in:
Dennis Luxen
2014-12-17 11:19:08 +01:00
parent 40ff7ad999
commit 3dddd16ec7
47 changed files with 2620 additions and 2251 deletions
Download Patch File Download Diff File Expand all files Collapse all files
third_party/osmium/osm/diff_object.hpp
Vendored
+8 -8
View File
@@ -66,11 +66,11 @@ namespace osmium {
m_next(&next) {
}
DiffObject(const DiffObject& other) = default;
DiffObject& operator=(const DiffObject& other) = default;
DiffObject(const DiffObject&) = default;
DiffObject& operator=(const DiffObject&) = default;
DiffObject(DiffObject&& other) = default;
DiffObject& operator=(DiffObject&& other) = default;
DiffObject(DiffObject&&) = default;
DiffObject& operator=(DiffObject&&) = default;
const osmium::OSMObject& prev() const noexcept {
return *m_prev;
@@ -127,11 +127,11 @@ namespace osmium {
DiffObject(prev, curr, next) {
}
DiffObjectDerived(const DiffObjectDerived& other) = default;
DiffObjectDerived& operator=(const DiffObjectDerived& other) = default;
DiffObjectDerived(const DiffObjectDerived&) = default;
DiffObjectDerived& operator=(const DiffObjectDerived&) = default;
DiffObjectDerived(DiffObjectDerived&& other) = default;
DiffObjectDerived& operator=(DiffObjectDerived&& other) = default;
DiffObjectDerived(DiffObjectDerived&&) = default;
DiffObjectDerived& operator=(DiffObjectDerived&&) = default;
const T& prev() const noexcept {
return *static_cast<const T*>(m_prev);
third_party/osmium/osm/entity_bits.hpp
Vendored
+6
View File
@@ -61,7 +61,9 @@ namespace osmium {
node = 0x01,
way = 0x02,
relation = 0x04,
nwr = 0x07, ///< node, way, or relation object
area = 0x08,
nwra = 0x0f, ///< node, way, relation, or area object
object = 0x0f, ///< node, way, relation, or area object
changeset = 0x10,
all = 0x1f ///< object or changeset
@@ -81,6 +83,10 @@ namespace osmium {
return static_cast<type>(static_cast<int>(lhs) & static_cast<int> (rhs));
}
inline type operator~(const type value) noexcept {
return static_cast<type>(~static_cast<int>(value));
}
inline type operator&=(type& lhs, const type rhs) noexcept {
lhs = lhs & rhs;
return lhs;