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

sebastic pushed a commit to branch master
in repository libosmium.

commit 778b3037cb4ed45dc4d0123a686622c5efda3800
Merge: 09492b9 c62edf1
Author: Bas Couwenberg <sebas...@xs4all.nl>
Date:   Thu Nov 5 23:40:27 2015 +0100

    Merge tag 'upstream/2.5.1'
    
    Upstream version 2.5.1

 .travis.yml                                        | 181 ++++--
 CHANGELOG.md                                       |  48 +-
 CMakeLists.txt                                     |  32 +-
 CONTRIBUTING.md                                    |  47 +-
 README.md                                          |  14 +-
 cmake/FindOsmium.cmake                             |  13 +-
 cmake/iwyu.sh                                      |   2 +-
 examples/CMakeLists.txt                            |   1 +
 examples/osmium_filter_discussions.cpp             |  72 +++
 include/osmium/area/assembler.hpp                  |   4 +
 include/osmium/area/detail/node_ref_segment.hpp    |   6 +-
 include/osmium/area/detail/proto_ring.hpp          |   9 +-
 include/osmium/area/detail/segment_list.hpp        |   2 +
 include/osmium/area/multipolygon_collector.hpp     |  10 +-
 include/osmium/area/problem_reporter_ogr.hpp       |   2 +-
 include/osmium/builder/builder.hpp                 |   4 +-
 include/osmium/builder/osm_object_builder.hpp      |  66 ++-
 include/osmium/diff_iterator.hpp                   |   2 +-
 include/osmium/diff_visitor.hpp                    |  12 +-
 include/osmium/dynamic_handler.hpp                 |  21 +-
 include/osmium/experimental/flex_reader.hpp        |  16 +-
 include/osmium/{io/overwrite.hpp => fwd.hpp}       |  46 +-
 include/osmium/geom/coordinates.hpp                |   1 -
 include/osmium/geom/factory.hpp                    |  16 +-
 include/osmium/geom/geojson.hpp                    |  12 +-
 include/osmium/geom/geos.hpp                       |   2 +-
 include/osmium/geom/ogr.hpp                        |   2 +-
 include/osmium/geom/rapid_geojson.hpp              |   4 +-
 include/osmium/geom/tile.hpp                       |   6 +-
 include/osmium/geom/wkb.hpp                        |  10 +-
 include/osmium/geom/wkt.hpp                        |  12 +-
 include/osmium/handler.hpp                         |  17 +-
 include/osmium/handler/chain.hpp                   |  10 +-
 include/osmium/handler/node_locations_for_ways.hpp |   2 +-
 include/osmium/index/bool_vector.hpp               |   4 +-
 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   |   6 +-
 include/osmium/index/detail/mmap_vector_file.hpp   |   8 +-
 include/osmium/index/detail/vector_map.hpp         |   4 +-
 include/osmium/index/detail/vector_multimap.hpp    |   2 +-
 include/osmium/index/map.hpp                       |  21 +-
 include/osmium/index/map/dummy.hpp                 |   2 +-
 include/osmium/index/map/sparse_mem_map.hpp        |  15 +-
 include/osmium/index/map/sparse_mem_table.hpp      |   3 +-
 include/osmium/index/multimap/hybrid.hpp           |  12 +-
 .../osmium/index/multimap/sparse_mem_multimap.hpp  |   2 +-
 include/osmium/io/any_input.hpp                    |   1 +
 include/osmium/io/bzip2_compression.hpp            |  67 ++-
 include/osmium/io/compression.hpp                  |  91 ++-
 include/osmium/io/detail/debug_output_format.hpp   | 225 ++++----
 include/osmium/io/detail/input_format.hpp          | 146 +++--
 include/osmium/io/detail/o5m_input_format.hpp      | 633 +++++++++++++++++++++
 include/osmium/io/detail/opl_output_format.hpp     | 135 ++---
 include/osmium/io/detail/output_format.hpp         |  62 +-
 include/osmium/io/detail/pbf.hpp                   |   1 +
 include/osmium/io/detail/pbf_decoder.hpp           |  26 +-
 include/osmium/io/detail/pbf_input_format.hpp      | 183 ++----
 include/osmium/io/detail/pbf_output_format.hpp     | 298 +++++-----
 include/osmium/io/detail/queue_util.hpp            | 157 +++++
 include/osmium/io/detail/read_thread.hpp           |  95 ++--
 include/osmium/io/detail/read_write.hpp            |  19 +-
 include/osmium/io/detail/string_table.hpp          |   1 +
 include/osmium/io/detail/string_util.hpp           | 206 +++++++
 include/osmium/io/detail/write_thread.hpp          |  63 +-
 include/osmium/io/detail/xml_input_format.hpp      | 542 ++++++++----------
 include/osmium/io/detail/xml_output_format.hpp     | 275 ++++-----
 include/osmium/io/detail/zlib.hpp                  |   5 +-
 include/osmium/io/error.hpp                        |  12 +
 include/osmium/io/file.hpp                         |   5 +-
 include/osmium/io/gzip_compression.hpp             |  62 +-
 include/osmium/io/input_iterator.hpp               |  40 +-
 include/osmium/io/{overwrite.hpp => o5m_input.hpp} |  27 +-
 include/osmium/io/output_iterator.hpp              |  65 ++-
 include/osmium/io/overwrite.hpp                    |  17 +-
 include/osmium/io/reader.hpp                       | 164 ++++--
 include/osmium/io/writer.hpp                       | 269 +++++++--
 .../io/{overwrite.hpp => writer_options.hpp}       |  16 +-
 include/osmium/memory/buffer.hpp                   |  93 ++-
 include/osmium/memory/collection.hpp               |   4 +-
 include/osmium/memory/item.hpp                     |   4 +-
 include/osmium/memory/item_iterator.hpp            |   6 +-
 include/osmium/object_pointer_collection.hpp       |   2 +-
 include/osmium/osm/area.hpp                        |   1 +
 include/osmium/osm/changeset.hpp                   | 133 ++++-
 include/osmium/osm/crc.hpp                         |  13 +-
 include/osmium/osm/diff_object.hpp                 |   7 +-
 include/osmium/osm/entity.hpp                      |   2 +-
 include/osmium/osm/item_type.hpp                   |   9 +-
 include/osmium/osm/node.hpp                        |   2 +-
 include/osmium/osm/node_ref_list.hpp               |   2 +-
 include/osmium/osm/object.hpp                      |  18 +-
 include/osmium/osm/relation.hpp                    |   4 +-
 include/osmium/osm/tag.hpp                         |   2 +-
 include/osmium/osm/timestamp.hpp                   |   8 +
 include/osmium/osm/types.hpp                       |   1 +
 include/osmium/osm/types_from_string.hpp           |  16 +-
 include/osmium/osm/way.hpp                         |   2 +-
 include/osmium/relations/collector.hpp             |  18 +-
 include/osmium/relations/detail/member_meta.hpp    |   2 +-
 include/osmium/tags/filter.hpp                     |   8 +-
 include/osmium/tags/taglist.hpp                    |   6 +-
 include/osmium/thread/function_wrapper.hpp         |  28 +-
 include/osmium/thread/pool.hpp                     |  21 +-
 include/osmium/thread/util.hpp                     |  37 +-
 include/osmium/util/compatibility.hpp              |   9 +
 include/osmium/util/data_file.hpp                  |   2 +-
 include/osmium/util/delta.hpp                      |  69 ++-
 include/osmium/util/file.hpp                       |   6 +-
 include/osmium/util/memory_mapping.hpp             |   4 +-
 include/osmium/util/options.hpp                    |  10 +
 include/osmium/visitor.hpp                         |  29 +-
 include/protozero/byteswap.hpp                     |  32 +-
 include/protozero/pbf_builder.hpp                  |  28 +-
 include/protozero/pbf_message.hpp                  |  44 ++
 include/protozero/pbf_reader.hpp                   |  12 +-
 include/protozero/pbf_writer.hpp                   |   4 +-
 include/protozero/version.hpp                      |   6 +-
 scripts/travis_install.sh                          |  20 -
 scripts/travis_script.sh                           |  36 --
 test/CMakeLists.txt                                |   9 +-
 test/data-tests/testdata-xml.cpp                   |  35 +-
 test/t/basic/test_changeset.cpp                    |  62 +-
 test/t/buffer/test_buffer_basics.cpp               |  34 ++
 test/t/geom/test_tile_data.hpp                     |   4 +-
 test/t/io/deleted_nodes.osh                        |   5 +
 test/t/io/deleted_nodes.osh.pbf                    | Bin 0 -> 189 bytes
 test/t/io/test_output_utils.cpp                    | 153 +++++
 test/t/io/test_reader.cpp                          | 105 +++-
 test/t/io/test_reader_with_mock_decompression.cpp  | 145 +++++
 test/t/io/test_reader_with_mock_parser.cpp         | 123 ++++
 test/t/io/test_string_table.cpp                    |   6 +-
 test/t/io/test_writer.cpp                          | 117 ++++
 test/t/io/test_writer_with_mock_compression.cpp    |  99 ++++
 test/t/io/test_writer_with_mock_encoder.cpp        | 105 ++++
 test/t/thread/test_pool.cpp                        |  33 +-
 test/t/util/test_data_file.cpp                     |   2 +-
 test/t/util/test_delta.cpp                         |  34 +-
 test/t/util/test_file.cpp                          |   2 +
 test/t/util/test_options.cpp                       |  19 +-
 140 files changed, 4823 insertions(+), 1724 deletions(-)

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

_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

Reply via email to