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

Merge commit '0c6dee4befebf823d839d1092bcae79afbf4f12e' into merge/libosmium-2.11.0

Browse Source
This commit is contained in:
Michael Krasnyk
2017-01-20 14:05:21 +01:00
parent 49d3467ec7 0c6dee4bef
commit 66cb75f4a3
231 changed files with 2732 additions and 1500 deletions
Download Patch File Download Diff File Expand all files Collapse all files
third_party/libosmium/include/osmium/memory/buffer.hpp
Vendored
+2 -2
View File
@@ -5,7 +5,7 @@
This file is part of Osmium (http://osmcode.org/libosmium).
Copyright 2013-2016 Jochen Topf <jochen@topf.org> and others (see README).
Copyright 2013-2017 Jochen Topf <jochen@topf.org> and others (see README).
Boost Software License - Version 1.0 - August 17th, 2003
@@ -116,7 +116,7 @@ namespace osmium {
#ifndef NDEBUG
uint8_t m_builder_count{0};
#endif
auto_grow m_auto_grow {auto_grow::no};
auto_grow m_auto_grow{auto_grow::no};
std::function<void(Buffer&)> m_full;
public:
third_party/libosmium/include/osmium/memory/collection.hpp
Vendored
+6 -2
View File
@@ -5,7 +5,7 @@
This file is part of Osmium (http://osmcode.org/libosmium).
Copyright 2013-2016 Jochen Topf <jochen@topf.org> and others (see README).
Copyright 2013-2017 Jochen Topf <jochen@topf.org> and others (see README).
Boost Software License - Version 1.0 - August 17th, 2003
@@ -33,8 +33,8 @@ DEALINGS IN THE SOFTWARE.
*/
#include <iterator>
#include <iosfwd>
#include <iterator>
#include <type_traits>
#include <osmium/memory/item.hpp>
@@ -127,6 +127,10 @@ namespace osmium {
static constexpr osmium::item_type itemtype = TCollectionItemType;
constexpr static bool is_compatible_to(osmium::item_type t) noexcept {
return t == itemtype;
}
Collection() :
Item(sizeof(Collection<TMember, TCollectionItemType>), TCollectionItemType) {
}
third_party/libosmium/include/osmium/memory/item.hpp
Vendored
+5 -1
View File
@@ -5,7 +5,7 @@
This file is part of Osmium (http://osmcode.org/libosmium).
Copyright 2013-2016 Jochen Topf <jochen@topf.org> and others (see README).
Copyright 2013-2017 Jochen Topf <jochen@topf.org> and others (see README).
Boost Software License - Version 1.0 - August 17th, 2003
@@ -146,6 +146,10 @@ namespace osmium {
public:
constexpr static bool is_compatible_to(osmium::item_type /*t*/) noexcept {
return true;
}
unsigned char* next() noexcept {
return data() + padded_size();
}
third_party/libosmium/include/osmium/memory/item_iterator.hpp
Vendored
+8 -81
View File
@@ -1,11 +1,11 @@
#ifndef OSMIUM_ITEM_ITERATOR_HPP
#define OSMIUM_ITEM_ITERATOR_HPP
#ifndef OSMIUM_MEMORY_ITEM_ITERATOR_HPP
#define OSMIUM_MEMORY_ITEM_ITERATOR_HPP
/*
This file is part of Osmium (http://osmcode.org/libosmium).
Copyright 2013-2016 Jochen Topf <jochen@topf.org> and others (see README).
Copyright 2013-2017 Jochen Topf <jochen@topf.org> and others (see README).
Boost Software License - Version 1.0 - August 17th, 2003
@@ -35,8 +35,8 @@ DEALINGS IN THE SOFTWARE.
#include <cassert>
#include <cstddef>
#include <iterator>
#include <iosfwd>
#include <iterator>
#include <type_traits>
#include <osmium/memory/item.hpp>
@@ -44,86 +44,13 @@ DEALINGS IN THE SOFTWARE.
namespace osmium {
class Area;
class Changeset;
class InnerRing;
class Node;
class OSMEntity;
class OSMObject;
class OuterRing;
class Relation;
class RelationMemberList;
class TagList;
class Way;
class WayNodeList;
namespace memory {
namespace detail {
template <typename T>
inline bool type_is_compatible(osmium::item_type) noexcept {
return true;
}
template <>
inline bool type_is_compatible<osmium::Node>(osmium::item_type t) noexcept {
return t == osmium::item_type::node;
}
template <>
inline bool type_is_compatible<osmium::Way>(osmium::item_type t) noexcept {
return t == osmium::item_type::way;
}
template <>
inline bool type_is_compatible<osmium::Relation>(osmium::item_type t) noexcept {
return t == osmium::item_type::relation;
}
template <>
inline bool type_is_compatible<osmium::Area>(osmium::item_type t) noexcept {
return t == osmium::item_type::area;
}
template <>
inline bool type_is_compatible<osmium::Changeset>(osmium::item_type t) noexcept {
return t == osmium::item_type::changeset;
}
template <>
inline bool type_is_compatible<osmium::OSMObject>(osmium::item_type t) noexcept {
return t == osmium::item_type::node || t == osmium::item_type::way || t == osmium::item_type::relation || t == osmium::item_type::area;
}
template <>
inline bool type_is_compatible<osmium::OSMEntity>(osmium::item_type t) noexcept {
return t == osmium::item_type::node || t == osmium::item_type::way || t == osmium::item_type::relation || t == osmium::item_type::area || t == osmium::item_type::changeset;
}
template <>
inline bool type_is_compatible<osmium::TagList>(osmium::item_type t) noexcept {
return t == osmium::item_type::tag_list;
}
template <>
inline bool type_is_compatible<osmium::WayNodeList>(osmium::item_type t) noexcept {
return t == osmium::item_type::way_node_list;
}
template <>
inline bool type_is_compatible<osmium::RelationMemberList>(osmium::item_type t) noexcept {
return t == osmium::item_type::relation_member_list || t == osmium::item_type::relation_member_list_with_full_members;
}
template <>
inline bool type_is_compatible<osmium::OuterRing>(osmium::item_type t) noexcept {
return t == osmium::item_type::outer_ring;
}
template <>
inline bool type_is_compatible<osmium::InnerRing>(osmium::item_type t) noexcept {
return t == osmium::item_type::inner_ring;
constexpr inline bool type_is_compatible(osmium::item_type t) noexcept {
return T::is_compatible_to(t);
}
} // namespace detail
@@ -143,7 +70,7 @@ namespace osmium {
void advance_to_next_item_of_right_type() noexcept {
while (m_data != m_end &&
!detail::type_is_compatible<typename std::remove_const<TMember>::type>(reinterpret_cast<const osmium::memory::Item*>(m_data)->type())) {
!detail::type_is_compatible<TMember>(reinterpret_cast<const osmium::memory::Item*>(m_data)->type())) {
m_data = reinterpret_cast<TMember*>(m_data)->next();
}
}
@@ -320,4 +247,4 @@ namespace osmium {
} // namespace osmium
#endif // OSMIUM_ITEM_ITERATOR_HPP
#endif // OSMIUM_MEMORY_ITEM_ITERATOR_HPP