[osrm] 11/12: Merge tag 'upstream/4.8.1+ds'
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Mon Oct 19 20:50:24 UTC 2015
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository osrm.
commit 809c1b6edb592e26a4bcdda400ab3d56a2fa1847
Merge: 86e52d7 6878286
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Mon Oct 19 22:36:33 2015 +0200
Merge tag 'upstream/4.8.1+ds'
Upstream version 4.8.1+ds
third_party/libosmium/.gitignore | 2 -
third_party/libosmium/.travis.yml | 54 -
third_party/libosmium/.ycm_extra_conf.py | 48 -
third_party/libosmium/CHANGELOG.md | 115 -
third_party/libosmium/CMakeLists.txt | 388 -
third_party/libosmium/CONTRIBUTING.md | 132 -
third_party/libosmium/EXTERNAL_LICENSES.txt | 233 -
third_party/libosmium/LICENSE.txt | 23 -
third_party/libosmium/Makefile | 25 -
third_party/libosmium/README.md | 108 -
third_party/libosmium/appveyor.yml | 124 -
third_party/libosmium/benchmarks/CMakeLists.txt | 49 -
third_party/libosmium/benchmarks/README.md | 41 -
third_party/libosmium/benchmarks/download_data.sh | 12 -
.../benchmarks/osmium_benchmark_count.cpp | 53 -
.../benchmarks/osmium_benchmark_count_tag.cpp | 54 -
.../benchmarks/osmium_benchmark_index_map.cpp | 39 -
.../osmium_benchmark_static_vs_dynamic_index.cpp | 135 -
.../benchmarks/osmium_benchmark_write_pbf.cpp | 34 -
.../libosmium/benchmarks/run_benchmark_count.sh | 22 -
.../benchmarks/run_benchmark_count_tag.sh | 22 -
.../benchmarks/run_benchmark_index_map.sh | 27 -
.../run_benchmark_static_vs_dynamic_index.sh | 21 -
.../benchmarks/run_benchmark_write_pbf.sh | 28 -
third_party/libosmium/benchmarks/run_benchmarks.sh | 15 -
third_party/libosmium/benchmarks/setup.sh | 34 -
third_party/libosmium/cmake/FindGem.cmake | 153 -
third_party/libosmium/cmake/FindOsmium.cmake | 334 -
third_party/libosmium/cmake/README | 3 -
third_party/libosmium/cmake/build.bat | 15 -
third_party/libosmium/cmake/iwyu.sh | 43 -
third_party/libosmium/doc/CMakeLists.txt | 33 -
third_party/libosmium/doc/Doxyfile.in | 2313 -----
third_party/libosmium/doc/README.md | 8 -
third_party/libosmium/doc/doc.txt | 26 -
third_party/libosmium/doc/header.html | 56 -
third_party/libosmium/doc/osmium.css | 22 -
third_party/libosmium/examples/CMakeLists.txt | 115 -
.../libosmium/examples/osmium_area_test.cpp | 136 -
third_party/libosmium/examples/osmium_convert.cpp | 111 -
third_party/libosmium/examples/osmium_count.cpp | 56 -
.../examples/osmium_create_node_cache.cpp | 55 -
third_party/libosmium/examples/osmium_debug.cpp | 50 -
third_party/libosmium/examples/osmium_index.cpp | 237 -
third_party/libosmium/examples/osmium_read.cpp | 30 -
third_party/libosmium/examples/osmium_serdump.cpp | 206 -
third_party/libosmium/examples/osmium_toogr.cpp | 244 -
third_party/libosmium/examples/osmium_toogr2.cpp | 331 -
.../libosmium/examples/osmium_toogr2_exp.cpp | 305 -
.../libosmium/examples/osmium_use_node_cache.cpp | 68 -
.../libosmium/include/osmium/area/assembler.hpp | 783 --
.../osmium/area/detail/node_ref_segment.hpp | 262 -
.../include/osmium/area/detail/proto_ring.hpp | 274 -
.../include/osmium/area/detail/segment_list.hpp | 216 -
.../include/osmium/area/multipolygon_collector.hpp | 219 -
.../include/osmium/area/problem_reporter.hpp | 149 -
.../osmium/area/problem_reporter_exception.hpp | 96 -
.../include/osmium/area/problem_reporter_ogr.hpp | 223 -
.../osmium/area/problem_reporter_stream.hpp | 96 -
.../libosmium/include/osmium/builder/builder.hpp | 237 -
.../include/osmium/builder/builder_helper.hpp | 103 -
.../include/osmium/builder/osm_object_builder.hpp | 305 -
.../libosmium/include/osmium/diff_handler.hpp | 67 -
.../libosmium/include/osmium/diff_iterator.hpp | 129 -
.../libosmium/include/osmium/diff_visitor.hpp | 104 -
.../libosmium/include/osmium/dynamic_handler.hpp | 195 -
.../include/osmium/experimental/flex_reader.hpp | 129 -
.../libosmium/include/osmium/geom/coordinates.hpp | 97 -
.../libosmium/include/osmium/geom/factory.hpp | 418 -
.../libosmium/include/osmium/geom/geojson.hpp | 154 -
third_party/libosmium/include/osmium/geom/geos.hpp | 240 -
.../libosmium/include/osmium/geom/haversine.hpp | 94 -
.../include/osmium/geom/mercator_projection.hpp | 110 -
third_party/libosmium/include/osmium/geom/ogr.hpp | 206 -
.../libosmium/include/osmium/geom/projection.hpp | 167 -
.../include/osmium/geom/rapid_geojson.hpp | 190 -
.../libosmium/include/osmium/geom/relations.hpp | 57 -
third_party/libosmium/include/osmium/geom/tile.hpp | 101 -
third_party/libosmium/include/osmium/geom/util.hpp | 75 -
third_party/libosmium/include/osmium/geom/wkb.hpp | 269 -
third_party/libosmium/include/osmium/geom/wkt.hpp | 150 -
third_party/libosmium/include/osmium/handler.hpp | 101 -
.../libosmium/include/osmium/handler/chain.hpp | 128 -
.../include/osmium/handler/disk_store.hpp | 111 -
.../libosmium/include/osmium/handler/dump.hpp | 294 -
.../osmium/handler/node_locations_for_ways.hpp | 180 -
.../include/osmium/handler/object_relations.hpp | 106 -
.../libosmium/include/osmium/index/bool_vector.hpp | 83 -
.../osmium/index/detail/create_map_with_fd.hpp | 71 -
.../osmium/index/detail/mmap_vector_anon.hpp | 65 -
.../osmium/index/detail/mmap_vector_base.hpp | 180 -
.../osmium/index/detail/mmap_vector_file.hpp | 70 -
.../include/osmium/index/detail/tmpfile.hpp | 62 -
.../include/osmium/index/detail/vector_map.hpp | 246 -
.../osmium/index/detail/vector_multimap.hpp | 186 -
.../libosmium/include/osmium/index/index.hpp | 100 -
third_party/libosmium/include/osmium/index/map.hpp | 266 -
.../libosmium/include/osmium/index/map/all.hpp | 46 -
.../include/osmium/index/map/dense_file_array.hpp | 67 -
.../include/osmium/index/map/dense_mem_array.hpp | 57 -
.../include/osmium/index/map/dense_mmap_array.hpp | 60 -
.../libosmium/include/osmium/index/map/dummy.hpp | 88 -
.../include/osmium/index/map/sparse_file_array.hpp | 67 -
.../include/osmium/index/map/sparse_mem_array.hpp | 60 -
.../include/osmium/index/map/sparse_mem_map.hpp | 115 -
.../include/osmium/index/map/sparse_mem_table.hpp | 146 -
.../include/osmium/index/map/sparse_mmap_array.hpp | 60 -
.../libosmium/include/osmium/index/multimap.hpp | 127 -
.../include/osmium/index/multimap/all.hpp | 41 -
.../include/osmium/index/multimap/hybrid.hpp | 200 -
.../osmium/index/multimap/sparse_file_array.hpp | 54 -
.../osmium/index/multimap/sparse_mem_array.hpp | 58 -
.../osmium/index/multimap/sparse_mem_multimap.hpp | 151 -
.../osmium/index/multimap/sparse_mmap_array.hpp | 58 -
.../include/osmium/index/node_locations_map.hpp | 70 -
.../include/osmium/io/any_compression.hpp | 48 -
.../libosmium/include/osmium/io/any_input.hpp | 51 -
.../libosmium/include/osmium/io/any_output.hpp | 53 -
.../include/osmium/io/bzip2_compression.hpp | 294 -
.../libosmium/include/osmium/io/compression.hpp | 286 -
.../libosmium/include/osmium/io/debug_output.hpp | 39 -
.../osmium/io/detail/debug_output_format.hpp | 482 -
.../include/osmium/io/detail/input_format.hpp | 158 -
.../include/osmium/io/detail/opl_output_format.hpp | 316 -
.../include/osmium/io/detail/output_format.hpp | 156 -
.../libosmium/include/osmium/io/detail/pbf.hpp | 88 -
.../include/osmium/io/detail/pbf_decoder.hpp | 760 --
.../include/osmium/io/detail/pbf_input_format.hpp | 303 -
.../include/osmium/io/detail/pbf_output_format.hpp | 599 --
.../include/osmium/io/detail/protobuf_tags.hpp | 170 -
.../include/osmium/io/detail/read_thread.hpp | 106 -
.../include/osmium/io/detail/read_write.hpp | 160 -
.../include/osmium/io/detail/string_table.hpp | 250 -
.../include/osmium/io/detail/write_thread.hpp | 86 -
.../include/osmium/io/detail/xml_input_format.hpp | 759 --
.../include/osmium/io/detail/xml_output_format.hpp | 498 --
.../libosmium/include/osmium/io/detail/zlib.hpp | 114 -
third_party/libosmium/include/osmium/io/error.hpp | 58 -
third_party/libosmium/include/osmium/io/file.hpp | 326 -
.../include/osmium/io/file_compression.hpp | 72 -
.../libosmium/include/osmium/io/file_format.hpp | 84 -
.../include/osmium/io/gzip_compression.hpp | 251 -
third_party/libosmium/include/osmium/io/header.hpp | 122 -
.../libosmium/include/osmium/io/input_iterator.hpp | 140 -
.../libosmium/include/osmium/io/opl_output.hpp | 39 -
.../include/osmium/io/output_iterator.hpp | 124 -
.../libosmium/include/osmium/io/overwrite.hpp | 52 -
.../libosmium/include/osmium/io/pbf_input.hpp | 48 -
.../libosmium/include/osmium/io/pbf_output.hpp | 48 -
third_party/libosmium/include/osmium/io/reader.hpp | 312 -
.../include/osmium/io/reader_iterator.hpp | 51 -
third_party/libosmium/include/osmium/io/writer.hpp | 145 -
.../libosmium/include/osmium/io/xml_input.hpp | 48 -
.../libosmium/include/osmium/io/xml_output.hpp | 47 -
.../libosmium/include/osmium/memory/buffer.hpp | 552 --
.../libosmium/include/osmium/memory/collection.hpp | 153 -
.../libosmium/include/osmium/memory/item.hpp | 177 -
.../include/osmium/memory/item_iterator.hpp | 234 -
.../include/osmium/object_pointer_collection.hpp | 112 -
third_party/libosmium/include/osmium/osm.hpp | 48 -
third_party/libosmium/include/osmium/osm/area.hpp | 214 -
third_party/libosmium/include/osmium/osm/box.hpp | 250 -
.../libosmium/include/osmium/osm/changeset.hpp | 335 -
third_party/libosmium/include/osmium/osm/crc.hpp | 223 -
.../libosmium/include/osmium/osm/diff_object.hpp | 183 -
.../libosmium/include/osmium/osm/entity.hpp | 80 -
.../libosmium/include/osmium/osm/entity_bits.hpp | 105 -
.../libosmium/include/osmium/osm/item_type.hpp | 193 -
.../libosmium/include/osmium/osm/location.hpp | 285 -
third_party/libosmium/include/osmium/osm/node.hpp | 76 -
.../libosmium/include/osmium/osm/node_ref.hpp | 173 -
.../libosmium/include/osmium/osm/node_ref_list.hpp | 184 -
.../libosmium/include/osmium/osm/object.hpp | 438 -
.../include/osmium/osm/object_comparisons.hpp | 110 -
.../libosmium/include/osmium/osm/relation.hpp | 194 -
.../libosmium/include/osmium/osm/segment.hpp | 105 -
third_party/libosmium/include/osmium/osm/tag.hpp | 140 -
.../libosmium/include/osmium/osm/timestamp.hpp | 185 -
third_party/libosmium/include/osmium/osm/types.hpp | 62 -
.../include/osmium/osm/types_from_string.hpp | 116 -
.../include/osmium/osm/undirected_segment.hpp | 100 -
third_party/libosmium/include/osmium/osm/way.hpp | 117 -
.../include/osmium/relations/collector.hpp | 544 --
.../osmium/relations/detail/member_meta.hpp | 158 -
.../osmium/relations/detail/relation_meta.hpp | 136 -
.../libosmium/include/osmium/tags/filter.hpp | 162 -
.../libosmium/include/osmium/tags/regex_filter.hpp | 58 -
.../libosmium/include/osmium/tags/taglist.hpp | 67 -
.../include/osmium/thread/function_wrapper.hpp | 111 -
.../libosmium/include/osmium/thread/pool.hpp | 181 -
.../libosmium/include/osmium/thread/queue.hpp | 192 -
.../include/osmium/thread/sorted_queue.hpp | 159 -
.../libosmium/include/osmium/thread/util.hpp | 87 -
third_party/libosmium/include/osmium/util/cast.hpp | 103 -
.../include/osmium/util/compatibility.hpp | 47 -
.../libosmium/include/osmium/util/config.hpp | 72 -
.../libosmium/include/osmium/util/data_file.hpp | 194 -
.../libosmium/include/osmium/util/delta.hpp | 147 -
.../libosmium/include/osmium/util/double.hpp | 93 -
.../libosmium/include/osmium/util/endian.hpp | 45 -
third_party/libosmium/include/osmium/util/file.hpp | 119 -
.../include/osmium/util/memory_mapping.hpp | 750 --
.../libosmium/include/osmium/util/minmax.hpp | 120 -
.../libosmium/include/osmium/util/options.hpp | 155 -
.../libosmium/include/osmium/util/string.hpp | 102 -
.../include/osmium/util/verbose_output.hpp | 139 -
third_party/libosmium/include/osmium/visitor.hpp | 255 -
.../libosmium/include/protozero/byteswap.hpp | 49 -
.../libosmium/include/protozero/exception.hpp | 68 -
.../libosmium/include/protozero/pbf_builder.hpp | 111 -
.../libosmium/include/protozero/pbf_message.hpp | 50 -
.../libosmium/include/protozero/pbf_reader.hpp | 1059 ---
.../libosmium/include/protozero/pbf_types.hpp | 49 -
.../libosmium/include/protozero/pbf_writer.hpp | 664 --
third_party/libosmium/include/protozero/varint.hpp | 136 -
third_party/libosmium/include/utf8.h | 34 -
third_party/libosmium/include/utf8/checked.h | 327 -
third_party/libosmium/include/utf8/core.h | 329 -
third_party/libosmium/include/utf8/unchecked.h | 228 -
third_party/libosmium/osmium.imp | 11 -
third_party/libosmium/scripts/travis_install.sh | 20 -
third_party/libosmium/scripts/travis_script.sh | 29 -
third_party/libosmium/test/CMakeLists.txt | 178 -
third_party/libosmium/test/README | 13 -
third_party/libosmium/test/data-tests/.gitignore | 1 -
.../libosmium/test/data-tests/CMakeLists.txt | 118 -
third_party/libosmium/test/data-tests/README.md | 10 -
.../data-tests/include/check_basics_handler.hpp | 92 -
.../test/data-tests/include/check_wkt_handler.hpp | 86 -
.../libosmium/test/data-tests/include/common.hpp | 22 -
.../test/data-tests/include/testdata-testcases.hpp | 10 -
.../libosmium/test/data-tests/multipolygon.qgs | 880 --
.../data-tests/run-testdata-multipolygon.cmake | 46 -
.../test/data-tests/testcases/test-100.cpp | 41 -
.../test/data-tests/testcases/test-101.cpp | 43 -
.../test/data-tests/testcases/test-110.cpp | 58 -
.../test/data-tests/testdata-multipolygon.cpp | 291 -
.../test/data-tests/testdata-overview.cpp | 197 -
.../test/data-tests/testdata-testcases.cpp | 25 -
.../libosmium/test/data-tests/testdata-xml.cpp | 556 --
third_party/libosmium/test/include/catch.hpp | 9416 --------------------
third_party/libosmium/test/include/catch_orig.hpp | 9416 --------------------
third_party/libosmium/test/include/utils.hpp | 18 -
third_party/libosmium/test/include/win_mkstemp.hpp | 42 -
third_party/libosmium/test/t/area/test_area_id.cpp | 25 -
.../test/t/area/test_node_ref_segment.cpp | 115 -
third_party/libosmium/test/t/basic/helper.hpp | 103 -
third_party/libosmium/test/t/basic/test_box.cpp | 98 -
.../libosmium/test/t/basic/test_changeset.cpp | 63 -
third_party/libosmium/test/t/basic/test_crc.cpp | 49 -
.../libosmium/test/t/basic/test_entity_bits.cpp | 31 -
.../libosmium/test/t/basic/test_location.cpp | 154 -
third_party/libosmium/test/t/basic/test_node.cpp | 125 -
.../libosmium/test/t/basic/test_node_ref.cpp | 57 -
.../test/t/basic/test_object_comparisons.cpp | 147 -
.../libosmium/test/t/basic/test_relation.cpp | 65 -
.../libosmium/test/t/basic/test_timestamp.cpp | 62 -
.../test/t/basic/test_types_from_string.cpp | 90 -
third_party/libosmium/test/t/basic/test_way.cpp | 90 -
.../libosmium/test/t/buffer/test_buffer_node.cpp | 135 -
.../libosmium/test/t/buffer/test_buffer_purge.cpp | 186 -
third_party/libosmium/test/t/geom/helper.hpp | 15 -
.../libosmium/test/t/geom/test_exception.cpp | 16 -
.../test/t/geom/test_factory_with_projection.cpp | 41 -
third_party/libosmium/test/t/geom/test_geojson.cpp | 236 -
third_party/libosmium/test/t/geom/test_geos.cpp | 205 -
.../libosmium/test/t/geom/test_geos_wkb.cpp | 156 -
.../libosmium/test/t/geom/test_mercator.cpp | 37 -
third_party/libosmium/test/t/geom/test_ogr.cpp | 185 -
.../libosmium/test/t/geom/test_projection.cpp | 149 -
third_party/libosmium/test/t/geom/test_tile.cpp | 93 -
.../libosmium/test/t/geom/test_tile_data.hpp | 475 -
third_party/libosmium/test/t/geom/test_wkb.cpp | 133 -
third_party/libosmium/test/t/geom/test_wkt.cpp | 206 -
.../libosmium/test/t/index/test_id_to_location.cpp | 170 -
third_party/libosmium/test/t/io/data.osm | 4 -
third_party/libosmium/test/t/io/data.osm.bz2 | Bin 200 -> 0 bytes
third_party/libosmium/test/t/io/data.osm.gz | Bin 187 -> 0 bytes
third_party/libosmium/test/t/io/data_bzip2.txt | 1 -
third_party/libosmium/test/t/io/data_bzip2.txt.bz2 | Bin 45 -> 0 bytes
third_party/libosmium/test/t/io/test_bzip2.cpp | 33 -
.../libosmium/test/t/io/test_file_formats.cpp | 275 -
.../libosmium/test/t/io/test_output_iterator.cpp | 37 -
third_party/libosmium/test/t/io/test_reader.cpp | 117 -
.../libosmium/test/t/io/test_string_table.cpp | 94 -
third_party/libosmium/test/t/tags/test_filter.cpp | 216 -
.../libosmium/test/t/tags/test_operators.cpp | 61 -
.../libosmium/test/t/tags/test_tag_list.cpp | 102 -
third_party/libosmium/test/t/thread/test_pool.cpp | 68 -
.../test/t/util/test_cast_with_assert.cpp | 89 -
.../libosmium/test/t/util/test_data_file.cpp | 81 -
third_party/libosmium/test/t/util/test_delta.cpp | 68 -
third_party/libosmium/test/t/util/test_double.cpp | 33 -
third_party/libosmium/test/t/util/test_file.cpp | 69 -
.../libosmium/test/t/util/test_memory_mapping.cpp | 419 -
third_party/libosmium/test/t/util/test_minmax.cpp | 68 -
third_party/libosmium/test/t/util/test_options.cpp | 48 -
third_party/libosmium/test/t/util/test_string.cpp | 68 -
third_party/libosmium/test/test_main.cpp | 2 -
third_party/libosmium/test/valgrind.supp | 47 -
300 files changed, 63995 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/osrm.git
More information about the Pkg-grass-devel
mailing list