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

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch master
in repository libosmium.

commit b2eea00dd15dcb211652dcabc0d456798b25532e
Merge: 69836e5 c7d7c00
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Thu Dec 3 21:51:49 2015 +0100

    Merge tag 'upstream/2.5.4'
    
    Upstream version 2.5.4

 CHANGELOG.md                                       |  31 +++-
 CMakeLists.txt                                     |  97 +++++++++++-
 include/gdalcpp.hpp                                | 164 +++++++++++++++++----
 include/osmium/area/detail/node_ref_segment.hpp    |  62 ++++----
 include/osmium/area/multipolygon_collector.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/osm_object_builder.hpp      |  29 +++-
 include/osmium/dynamic_handler.hpp                 |  14 +-
 include/osmium/geom/factory.hpp                    |   8 +-
 include/osmium/handler.hpp                         |   2 +-
 include/osmium/index/detail/create_map_with_fd.hpp |  15 +-
 include/osmium/index/detail/vector_map.hpp         |  34 ++---
 include/osmium/index/detail/vector_multimap.hpp    |  14 +-
 include/osmium/index/index.hpp                     |   2 +-
 include/osmium/index/map/dummy.hpp                 |  12 +-
 include/osmium/index/map/sparse_mem_map.hpp        |  14 +-
 include/osmium/index/map/sparse_mem_table.hpp      |  14 +-
 include/osmium/index/multimap.hpp                  |   2 +-
 include/osmium/index/multimap/hybrid.hpp           |  12 +-
 .../osmium/index/multimap/sparse_mem_multimap.hpp  |  12 +-
 include/osmium/io/bzip2_compression.hpp            |  20 +--
 include/osmium/io/compression.hpp                  |  14 +-
 include/osmium/io/detail/debug_output_format.hpp   |   6 +-
 include/osmium/io/detail/o5m_input_format.hpp      |   9 +-
 include/osmium/io/detail/opl_output_format.hpp     |   4 +-
 include/osmium/io/detail/output_format.hpp         |   2 +-
 include/osmium/io/detail/pbf.hpp                   |   8 +-
 include/osmium/io/detail/pbf_input_format.hpp      |   4 +-
 include/osmium/io/detail/pbf_output_format.hpp     |  18 +--
 include/osmium/io/detail/queue_util.hpp            |   2 +-
 include/osmium/io/detail/read_write.hpp            |  40 ++---
 include/osmium/io/detail/string_table.hpp          |   2 +-
 include/osmium/io/detail/xml_input_format.hpp      |   6 +-
 include/osmium/io/detail/xml_output_format.hpp     |  10 +-
 include/osmium/io/error.hpp                        |   8 +-
 include/osmium/io/gzip_compression.hpp             |  18 +--
 include/osmium/io/reader.hpp                       |   2 +-
 include/osmium/memory/buffer.hpp                   |   5 +-
 include/osmium/memory/collection.hpp               |   2 +-
 include/osmium/memory/item.hpp                     |   2 +-
 include/osmium/memory/item_iterator.hpp            |   2 +-
 include/osmium/osm/area.hpp                        |   2 +-
 include/osmium/osm/box.hpp                         |   8 +-
 include/osmium/osm/changeset.hpp                   |   2 +-
 include/osmium/osm/crc.hpp                         |   2 +-
 include/osmium/osm/location.hpp                    |  18 +--
 include/osmium/osm/node.hpp                        |   2 +-
 include/osmium/osm/node_ref.hpp                    |  26 ++--
 include/osmium/osm/node_ref_list.hpp               |   2 +-
 include/osmium/osm/relation.hpp                    |   8 +-
 include/osmium/osm/segment.hpp                     |   8 +-
 include/osmium/osm/tag.hpp                         |   3 +-
 include/osmium/osm/timestamp.hpp                   |  72 +++++++--
 include/osmium/osm/way.hpp                         |   2 +-
 include/osmium/thread/function_wrapper.hpp         |   2 +-
 include/osmium/thread/pool.hpp                     |  36 +++--
 include/osmium/thread/queue.hpp                    |   2 +-
 include/osmium/thread/util.hpp                     |   2 +-
 include/osmium/util/compatibility.hpp              |   3 -
 include/osmium/util/config.hpp                     |   2 +-
 include/osmium/util/delta.hpp                      |   2 +-
 include/osmium/util/double.hpp                     |   8 +-
 include/osmium/util/memory_mapping.hpp             |   4 +-
 include/osmium/visitor.hpp                         |   2 +-
 include/protozero/byteswap.hpp                     |  10 +-
 include/protozero/config.hpp                       |  57 +++++++
 include/protozero/pbf_reader.hpp                   |  34 +++--
 include/protozero/pbf_writer.hpp                   |  13 +-
 include/protozero/version.hpp                      |   4 +-
 test/data-tests/CMakeLists.txt                     |   6 +-
 test/data-tests/testdata-multipolygon.cpp          |   4 +-
 test/data-tests/testdata-overview.cpp              |   4 +-
 test/t/area/test_node_ref_segment.cpp              |  14 ++
 test/t/basic/test_node.cpp                         |   4 +-
 test/t/basic/test_relation.cpp                     |   2 +-
 test/t/basic/test_timestamp.cpp                    |  10 +-
 test/t/basic/test_way.cpp                          |   2 +-
 test/t/buffer/test_buffer_node.cpp                 |  36 ++++-
 test/t/io/test_reader_with_mock_decompression.cpp  |   6 +-
 test/t/io/test_reader_with_mock_parser.cpp         |   2 +-
 test/t/io/test_writer_with_mock_compression.cpp    |   6 +-
 test/t/io/test_writer_with_mock_encoder.cpp        |   6 +-
 test/t/thread/test_pool.cpp                        |  29 ++++
 85 files changed, 823 insertions(+), 374 deletions(-)

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