[libosmium] 03/06: Merge tag 'upstream/2.6.0'

Sebastiaan Couwenberg sebastic at moszumanska.debian.org
Sat Feb 6 19:42:36 UTC 2016


This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository libosmium.

commit d10b83c5a79cee45ae78ff9281248d6d7f69e9d0
Merge: f8edbe7 d54506b
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Feb 6 20:09:12 2016 +0100

    Merge tag 'upstream/2.6.0'
    
    Upstream version 2.6.0

 CHANGELOG.md                                       |   29 +-
 CMakeLists.txt                                     |    8 +-
 include/osmium/area/assembler.hpp                  |    4 +-
 include/osmium/area/detail/node_ref_segment.hpp    |    2 +-
 include/osmium/area/detail/proto_ring.hpp          |    2 +-
 include/osmium/area/detail/segment_list.hpp        |    2 +-
 include/osmium/area/multipolygon_collector.hpp     |    2 +-
 include/osmium/area/problem_reporter.hpp           |    2 +-
 include/osmium/area/problem_reporter_exception.hpp |    2 +-
 include/osmium/area/problem_reporter_ogr.hpp       |    2 +-
 include/osmium/area/problem_reporter_stream.hpp    |    2 +-
 include/osmium/builder/attr.hpp                    |  877 ++
 include/osmium/builder/builder.hpp                 |    2 +-
 include/osmium/builder/builder_helper.hpp          |   21 +-
 include/osmium/builder/osm_object_builder.hpp      |   14 +-
 include/osmium/diff_handler.hpp                    |    2 +-
 include/osmium/diff_iterator.hpp                   |    2 +-
 include/osmium/diff_visitor.hpp                    |    2 +-
 include/osmium/dynamic_handler.hpp                 |    2 +-
 include/osmium/experimental/flex_reader.hpp        |    2 +-
 include/osmium/fwd.hpp                             |    2 +-
 include/osmium/geom/coordinates.hpp                |    2 +-
 include/osmium/geom/factory.hpp                    |    2 +-
 include/osmium/geom/geojson.hpp                    |    2 +-
 include/osmium/geom/geos.hpp                       |    2 +-
 include/osmium/geom/haversine.hpp                  |    2 +-
 include/osmium/geom/mercator_projection.hpp        |    2 +-
 include/osmium/geom/ogr.hpp                        |    2 +-
 include/osmium/geom/projection.hpp                 |   45 +-
 include/osmium/geom/rapid_geojson.hpp              |    2 +-
 include/osmium/geom/relations.hpp                  |    2 +-
 include/osmium/geom/tile.hpp                       |    2 +-
 include/osmium/geom/util.hpp                       |    2 +-
 include/osmium/geom/wkb.hpp                        |    2 +-
 include/osmium/geom/wkt.hpp                        |    2 +-
 include/osmium/handler.hpp                         |    2 +-
 include/osmium/handler/chain.hpp                   |    2 +-
 include/osmium/handler/check_order.hpp             |  136 +
 include/osmium/handler/disk_store.hpp              |    2 +-
 include/osmium/handler/dump.hpp                    |    2 +-
 include/osmium/handler/node_locations_for_ways.hpp |    2 +-
 include/osmium/handler/object_relations.hpp        |    2 +-
 include/osmium/index/bool_vector.hpp               |    2 +-
 include/osmium/index/detail/create_map_with_fd.hpp |    2 +-
 include/osmium/index/detail/mmap_vector_anon.hpp   |    2 +-
 include/osmium/index/detail/mmap_vector_base.hpp   |    2 +-
 include/osmium/index/detail/mmap_vector_file.hpp   |    2 +-
 include/osmium/index/detail/tmpfile.hpp            |    2 +-
 include/osmium/index/detail/vector_map.hpp         |    2 +-
 include/osmium/index/detail/vector_multimap.hpp    |    2 +-
 include/osmium/index/index.hpp                     |    2 +-
 include/osmium/index/map.hpp                       |    2 +-
 include/osmium/index/map/all.hpp                   |    2 +-
 include/osmium/index/map/dense_file_array.hpp      |    2 +-
 include/osmium/index/map/dense_mem_array.hpp       |    2 +-
 include/osmium/index/map/dense_mmap_array.hpp      |    2 +-
 include/osmium/index/map/dummy.hpp                 |    2 +-
 include/osmium/index/map/sparse_file_array.hpp     |    2 +-
 include/osmium/index/map/sparse_mem_array.hpp      |    2 +-
 include/osmium/index/map/sparse_mem_map.hpp        |    2 +-
 include/osmium/index/map/sparse_mem_table.hpp      |    2 +-
 include/osmium/index/map/sparse_mmap_array.hpp     |    2 +-
 include/osmium/index/multimap.hpp                  |    2 +-
 include/osmium/index/multimap/all.hpp              |    2 +-
 include/osmium/index/multimap/hybrid.hpp           |    2 +-
 .../osmium/index/multimap/sparse_file_array.hpp    |    2 +-
 include/osmium/index/multimap/sparse_mem_array.hpp |    2 +-
 .../osmium/index/multimap/sparse_mem_multimap.hpp  |    2 +-
 .../osmium/index/multimap/sparse_mmap_array.hpp    |    2 +-
 include/osmium/index/node_locations_map.hpp        |    2 +-
 include/osmium/io/any_compression.hpp              |    2 +-
 include/osmium/io/any_input.hpp                    |    2 +-
 include/osmium/io/any_output.hpp                   |    2 +-
 include/osmium/io/bzip2_compression.hpp            |    2 +-
 include/osmium/io/compression.hpp                  |    2 +-
 include/osmium/io/debug_output.hpp                 |    2 +-
 include/osmium/io/detail/debug_output_format.hpp   |    2 +-
 include/osmium/io/detail/input_format.hpp          |    2 +-
 include/osmium/io/detail/o5m_input_format.hpp      |    2 +-
 include/osmium/io/detail/opl_output_format.hpp     |    2 +-
 include/osmium/io/detail/output_format.hpp         |    2 +-
 include/osmium/io/detail/pbf.hpp                   |    2 +-
 include/osmium/io/detail/pbf_decoder.hpp           |    2 +-
 include/osmium/io/detail/pbf_input_format.hpp      |    2 +-
 include/osmium/io/detail/pbf_output_format.hpp     |    2 +-
 include/osmium/io/detail/protobuf_tags.hpp         |    2 +-
 include/osmium/io/detail/queue_util.hpp            |    2 +-
 include/osmium/io/detail/read_thread.hpp           |    2 +-
 include/osmium/io/detail/read_write.hpp            |    2 +-
 include/osmium/io/detail/string_table.hpp          |    2 +-
 include/osmium/io/detail/string_util.hpp           |    7 +-
 include/osmium/io/detail/write_thread.hpp          |    2 +-
 include/osmium/io/detail/xml_input_format.hpp      |    2 +-
 include/osmium/io/detail/xml_output_format.hpp     |    2 +-
 include/osmium/io/detail/zlib.hpp                  |    2 +-
 include/osmium/io/error.hpp                        |    2 +-
 include/osmium/io/file.hpp                         |    2 +-
 include/osmium/io/file_compression.hpp             |    2 +-
 include/osmium/io/file_format.hpp                  |    2 +-
 include/osmium/io/gzip_compression.hpp             |    2 +-
 include/osmium/io/header.hpp                       |    2 +-
 include/osmium/io/input_iterator.hpp               |    2 +-
 include/osmium/io/o5m_input.hpp                    |    2 +-
 include/osmium/io/opl_output.hpp                   |    2 +-
 include/osmium/io/output_iterator.hpp              |    2 +-
 include/osmium/io/overwrite.hpp                    |    2 +-
 include/osmium/io/pbf_input.hpp                    |    2 +-
 include/osmium/io/pbf_output.hpp                   |    2 +-
 include/osmium/io/reader.hpp                       |    2 +-
 include/osmium/io/reader_iterator.hpp              |    2 +-
 include/osmium/io/writer.hpp                       |    2 +-
 include/osmium/io/writer_options.hpp               |    2 +-
 include/osmium/io/xml_input.hpp                    |    2 +-
 include/osmium/io/xml_output.hpp                   |    2 +-
 include/osmium/memory/buffer.hpp                   |   42 +-
 include/osmium/memory/collection.hpp               |   12 +-
 include/osmium/memory/item.hpp                     |    2 +-
 include/osmium/memory/item_iterator.hpp            |   12 +-
 include/osmium/object_pointer_collection.hpp       |    2 +-
 include/osmium/osm.hpp                             |    2 +-
 include/osmium/osm/area.hpp                        |    2 +-
 include/osmium/osm/box.hpp                         |   13 +-
 include/osmium/osm/changeset.hpp                   |    2 +-
 include/osmium/osm/crc.hpp                         |    2 +-
 include/osmium/osm/diff_object.hpp                 |    2 +-
 include/osmium/osm/entity.hpp                      |    2 +-
 include/osmium/osm/entity_bits.hpp                 |    2 +-
 include/osmium/osm/item_type.hpp                   |    2 +-
 include/osmium/osm/location.hpp                    |    2 +-
 include/osmium/osm/node.hpp                        |    2 +-
 include/osmium/osm/node_ref.hpp                    |    2 +-
 include/osmium/osm/node_ref_list.hpp               |    2 +-
 include/osmium/osm/object.hpp                      |    2 +-
 include/osmium/osm/object_comparisons.hpp          |    2 +-
 include/osmium/osm/relation.hpp                    |    2 +-
 include/osmium/osm/segment.hpp                     |    2 +-
 include/osmium/osm/tag.hpp                         |    2 +-
 include/osmium/osm/timestamp.hpp                   |   17 +-
 include/osmium/osm/types.hpp                       |    2 +-
 include/osmium/osm/types_from_string.hpp           |    2 +-
 include/osmium/osm/undirected_segment.hpp          |    2 +-
 include/osmium/osm/way.hpp                         |    2 +-
 include/osmium/relations/collector.hpp             |    2 +-
 include/osmium/relations/detail/member_meta.hpp    |    2 +-
 include/osmium/relations/detail/relation_meta.hpp  |    2 +-
 include/osmium/tags/filter.hpp                     |    2 +-
 include/osmium/tags/regex_filter.hpp               |    2 +-
 include/osmium/tags/taglist.hpp                    |    2 +-
 include/osmium/thread/function_wrapper.hpp         |    2 +-
 include/osmium/thread/pool.hpp                     |    2 +-
 include/osmium/thread/queue.hpp                    |    2 +-
 include/osmium/thread/sorted_queue.hpp             |    2 +-
 include/osmium/thread/util.hpp                     |    2 +-
 include/osmium/util/cast.hpp                       |    2 +-
 include/osmium/util/compatibility.hpp              |    2 +-
 include/osmium/util/config.hpp                     |    2 +-
 include/osmium/util/delta.hpp                      |    2 +-
 include/osmium/util/double.hpp                     |    2 +-
 include/osmium/util/endian.hpp                     |    2 +-
 include/osmium/util/file.hpp                       |    2 +-
 include/osmium/util/memory.hpp                     |   99 +
 include/osmium/util/memory_mapping.hpp             |    2 +-
 include/osmium/util/minmax.hpp                     |    2 +-
 include/osmium/util/options.hpp                    |    2 +-
 include/osmium/util/string.hpp                     |    2 +-
 include/osmium/util/verbose_output.hpp             |   17 +-
 include/osmium/visitor.hpp                         |    2 +-
 test/CMakeLists.txt                                |    4 +
 test/include/catch.hpp                             | 3045 ++++---
 test/include/catch_orig.hpp                        | 9416 --------------------
 test/t/basic/helper.hpp                            |  103 -
 test/t/basic/test_box.cpp                          |   90 +-
 test/t/basic/test_changeset.cpp                    |   76 +-
 test/t/basic/test_crc.cpp                          |    2 -
 test/t/basic/test_node.cpp                         |   69 +-
 test/t/basic/test_object_comparisons.cpp           |   91 +-
 test/t/basic/test_relation.cpp                     |   37 +-
 test/t/basic/test_way.cpp                          |   53 +-
 test/t/builder/test_attr.cpp                       |  567 ++
 test/t/geom/area_helper.hpp                        |   81 +
 test/t/geom/test_crs.cpp                           |   18 +
 test/t/geom/test_geojson.cpp                       |  102 +-
 test/t/geom/test_geos.cpp                          |   76 +-
 test/t/geom/test_geos_wkb.cpp                      |   76 +-
 test/t/geom/test_ogr.cpp                           |   76 +-
 test/t/geom/test_wkb.cpp                           |   30 +-
 test/t/geom/test_wkt.cpp                           |   88 +-
 test/t/geom/wnl_helper.hpp                         |   44 +
 test/t/io/test_reader_with_mock_parser.cpp         |   17 +-
 test/t/io/test_writer.cpp                          |   31 +-
 test/t/tags/test_filter.cpp                        |   34 +-
 test/t/tags/test_tag_list.cpp                      |  129 +-
 test/t/util/test_memory.cpp                        |   34 +
 193 files changed, 4507 insertions(+), 11537 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/libosmium.git



More information about the Pkg-grass-devel mailing list