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

pull in latest osmcode/libosmium changes

Browse Source
This commit is contained in:
Dennis Luxen
2015-04-13 15:44:38 +02:00
parent 27c9230a82 c0402345f7
commit 9cc68b26e2
69 changed files with 1906 additions and 1528 deletions
Download Patch File Download Diff File Expand all files Collapse all files
third_party/libosmium/include/osmium/handler/dump.hpp
Vendored
+1 -1
View File
@@ -136,7 +136,7 @@ namespace osmium {
public:
explicit Dump(std::ostream& out, bool with_size=true, const std::string& prefix="") :
explicit Dump(std::ostream& out, bool with_size = true, const std::string& prefix = "") :
m_out(&out),
m_with_size(with_size),
m_prefix(prefix) {
third_party/libosmium/include/osmium/handler/node_locations_for_ways.hpp
Vendored
+2 -4
View File
@@ -63,11 +63,9 @@ namespace osmium {
template <class TStoragePosIDs, class TStorageNegIDs = dummy_type>
class NodeLocationsForWays : public osmium::handler::Handler {
static_assert(std::is_base_of<osmium::index::map::Map<osmium::unsigned_object_id_type, osmium::Location>, TStoragePosIDs>::value,
"Index class must be derived from osmium::index::map::Map<osmium::unsigned_object_id_type, osmium::Location>");
static_assert(std::is_base_of<osmium::index::map::Map<osmium::unsigned_object_id_type, osmium::Location>, TStoragePosIDs>::value, "Index class must be derived from osmium::index::map::Map<osmium::unsigned_object_id_type, osmium::Location>");
static_assert(std::is_base_of<osmium::index::map::Map<osmium::unsigned_object_id_type, osmium::Location>, TStorageNegIDs>::value,
"Index class must be derived from osmium::index::map::Map<osmium::unsigned_object_id_type, osmium::Location>");
static_assert(std::is_base_of<osmium::index::map::Map<osmium::unsigned_object_id_type, osmium::Location>, TStorageNegIDs>::value, "Index class must be derived from osmium::index::map::Map<osmium::unsigned_object_id_type, osmium::Location>");
public: