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

sebastic pushed a commit to branch master
in repository libosmium.

commit cab9655b3623148720f4125bc007b19335fb1663
Merge: 43d3d89 07ba40b
Author: Bas Couwenberg <sebas...@xs4all.nl>
Date:   Tue Aug 18 14:08:47 2015 +0200

    Merge tag 'upstream/2.3.0'
    
    Upstream version 2.3.0

 .travis.yml                                        |   10 +-
 CHANGELOG.md                                       |   44 +-
 CMakeLists.txt                                     |    2 +-
 EXTERNAL_LICENSES.txt                              |  233 ++++
 README.md                                          |    4 +
 appveyor.yml                                       |   12 +-
 benchmarks/CMakeLists.txt                          |    1 +
 benchmarks/osmium_benchmark_count.cpp              |    2 -
 benchmarks/osmium_benchmark_count_tag.cpp          |    2 -
 benchmarks/osmium_benchmark_index_map.cpp          |    2 -
 .../osmium_benchmark_static_vs_dynamic_index.cpp   |    1 -
 benchmarks/osmium_benchmark_write_pbf.cpp          |   34 +
 benchmarks/run_benchmark_write_pbf.sh              |   28 +
 cmake/FindOSMPBF.cmake                             |   50 -
 cmake/FindOsmium.cmake                             |    8 +-
 cmake/iwyu.sh                                      |    4 +-
 examples/osmium_area_test.cpp                      |    2 -
 examples/osmium_convert.cpp                        |    1 -
 examples/osmium_count.cpp                          |    2 -
 examples/osmium_create_node_cache.cpp              |    2 -
 examples/osmium_debug.cpp                          |    2 -
 examples/osmium_read.cpp                           |    2 -
 examples/osmium_serdump.cpp                        |    2 -
 examples/osmium_toogr.cpp                          |    2 -
 examples/osmium_toogr2.cpp                         |    2 -
 examples/osmium_toogr2_exp.cpp                     |    2 -
 examples/osmium_use_node_cache.cpp                 |    2 -
 include/boost_unicode_iterator.hpp                 |  776 -----------
 include/osmium/area/multipolygon_collector.hpp     |    1 +
 include/osmium/builder/builder.hpp                 |   24 +-
 include/osmium/builder/osm_object_builder.hpp      |   53 +-
 include/osmium/geom/geos.hpp                       |   35 +-
 include/osmium/geom/wkb.hpp                        |   10 +-
 include/osmium/index/detail/create_map_with_fd.hpp |    2 -
 include/osmium/index/detail/mmap_vector_base.hpp   |    4 +-
 include/osmium/index/detail/mmap_vector_file.hpp   |    3 +-
 include/osmium/index/map/dense_mmap_array.hpp      |    2 +-
 include/osmium/index/map/sparse_mem_map.hpp        |    2 +-
 include/osmium/io/any_input.hpp                    |    4 +-
 include/osmium/io/any_output.hpp                   |    5 +-
 include/osmium/io/bzip2_compression.hpp            |    5 +
 include/osmium/io/compression.hpp                  |    5 +
 .../osmium/io/{pbf_output.hpp => debug_output.hpp} |   18 +-
 include/osmium/io/detail/debug_output_format.hpp   |  482 +++++++
 include/osmium/io/detail/opl_output_format.hpp     |   75 +-
 include/osmium/io/detail/pbf.hpp                   |   23 +-
 include/osmium/io/detail/pbf_decoder.hpp           |  760 +++++++++++
 include/osmium/io/detail/pbf_input_format.hpp      |   94 +-
 include/osmium/io/detail/pbf_output_format.hpp     | 1055 +++++----------
 include/osmium/io/detail/pbf_parser.hpp            |  456 -------
 include/osmium/io/detail/pbf_stringtable.hpp       |  218 ----
 include/osmium/io/detail/pbf_type_conv.hpp         |   73 --
 include/osmium/io/detail/protobuf_tags.hpp         |  170 +++
 include/osmium/io/detail/string_table.hpp          |  250 ++++
 include/osmium/io/detail/xml_input_format.hpp      |   36 +-
 include/osmium/io/detail/xml_output_format.hpp     |   60 +-
 include/osmium/io/detail/zlib.hpp                  |   15 +-
 include/osmium/io/file.hpp                         |   68 +-
 include/osmium/io/file_format.hpp                  |    8 +-
 include/osmium/io/gzip_compression.hpp             |    5 +
 include/osmium/io/pbf_input.hpp                    |    1 -
 include/osmium/io/pbf_output.hpp                   |    1 -
 include/osmium/memory/buffer.hpp                   |    3 +-
 include/osmium/memory/collection.hpp               |    1 -
 include/osmium/memory/item.hpp                     |    1 -
 include/osmium/osm/changeset.hpp                   |    1 -
 include/osmium/osm/crc.hpp                         |  223 ++++
 include/osmium/osm/entity.hpp                      |    1 +
 include/osmium/osm/node_ref.hpp                    |    2 +-
 include/osmium/osm/timestamp.hpp                   |    3 +-
 include/osmium/thread/queue.hpp                    |    4 +-
 include/osmium/thread/util.hpp                     |    2 +-
 include/osmium/util/data_file.hpp                  |    2 +
 include/osmium/util/delta.hpp                      |   54 +-
 .../osmium/{io/pbf_input.hpp => util/endian.hpp}   |   26 +-
 include/osmium/util/file.hpp                       |    1 +
 include/osmium/util/memory_mapping.hpp             |  113 +-
 include/osmium/util/minmax.hpp                     |    3 -
 include/protozero/byteswap.hpp                     |   49 +
 include/protozero/exception.hpp                    |   68 +
 include/protozero/pbf_builder.hpp                  |  111 ++
 include/protozero/pbf_message.hpp                  |   50 +
 include/protozero/pbf_reader.hpp                   | 1059 +++++++++++++++
 include/protozero/pbf_types.hpp                    |   49 +
 include/protozero/pbf_writer.hpp                   |  664 ++++++++++
 include/protozero/varint.hpp                       |  136 ++
 include/{osmium/io/pbf_input.hpp => utf8.h}        |   29 +-
 include/utf8/checked.h                             |  327 +++++
 include/utf8/core.h                                |  329 +++++
 include/utf8/unchecked.h                           |  228 ++++
 scripts/travis_install.sh                          |   12 +-
 scripts/travis_script.sh                           |    2 -
 test/CMakeLists.txt                                |    7 +
 test/data-tests/testdata-testcases.cpp             |    2 -
 test/data-tests/testdata-xml.cpp                   |  115 +-
 test/include/catch.hpp                             | 1355 +++++++++++++-------
 test/include/catch_orig.hpp                        | 1347 ++++++++++++-------
 test/t/basic/helper.hpp                            |   32 +-
 test/t/basic/test_box.cpp                          |    7 +
 test/t/basic/test_changeset.cpp                    |   12 +-
 test/t/basic/test_crc.cpp                          |   49 +
 test/t/basic/test_node.cpp                         |    8 +
 test/t/basic/test_relation.cpp                     |   11 +-
 test/t/basic/test_way.cpp                          |   10 +-
 test/t/geom/test_geos.cpp                          |   35 +-
 test/t/io/test_file_formats.cpp                    |   24 +
 test/t/io/test_string_table.cpp                    |   94 ++
 test/t/tags/test_tag_list.cpp                      |  126 +-
 test/t/util/test_delta.cpp                         |   24 +
 test/t/util/test_memory_mapping.cpp                |   72 +-
 110 files changed, 8429 insertions(+), 3711 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