[libosmium] 02/04: Merge tag 'upstream/2.5.3'

[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 376149433c70c3ce90fbd82bf391e476d041baaa
Merge: 2b8029b eec3347
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Wed Nov 18 22:36:48 2015 +0100

    Merge tag 'upstream/2.5.3'
    
    Upstream version 2.5.3

 CHANGELOG.md                                   |  21 ++-
 CMakeLists.txt                                 |   2 +-
 include/osmium/area/multipolygon_collector.hpp |  22 ---
 include/osmium/diff_handler.hpp                |   3 +-
 include/osmium/diff_iterator.hpp               |  35 ++--
 include/osmium/diff_visitor.hpp                |   2 +-
 include/osmium/io/output_iterator.hpp          |  13 +-
 include/osmium/memory/buffer.hpp               | 231 +++++++++++++++++++------
 include/osmium/memory/item_iterator.hpp        |  16 +-
 include/osmium/osm/diff_object.hpp             | 140 ++++++++++++---
 include/osmium/osm/item_type.hpp               |   8 +
 include/osmium/osm/node_ref.hpp                |  74 +++++++-
 include/osmium/osm/node_ref_list.hpp           |  29 ++--
 include/osmium/osm/timestamp.hpp               |  66 +++++--
 include/osmium/osm/types_from_string.hpp       |  67 +++++++
 include/osmium/relations/collector.hpp         | 159 +++++++++--------
 include/osmium/util/data_file.hpp              | 194 ---------------------
 include/osmium/util/memory_mapping.hpp         |  25 ++-
 include/osmium/util/options.hpp                |  66 +++++--
 include/osmium/visitor.hpp                     |   7 +-
 test/CMakeLists.txt                            |   1 -
 test/t/basic/test_object_comparisons.cpp       |  44 ++---
 test/t/basic/test_timestamp.cpp                |  17 +-
 test/t/buffer/test_buffer_node.cpp             |  44 ++++-
 test/t/util/test_data_file.cpp                 |  81 ---------
 test/t/util/test_options.cpp                   |  30 +++-
 26 files changed, 813 insertions(+), 584 deletions(-)

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