Bump version of protozero to 1.7.1 (#6999)

scripts/update_dependencies.sh

@@ -22,7 +22,7 @@ MICROTAR_PATH="rxi/microtar"
 MICROTAR_TAG=v0.1.0
 
 PROTOZERO_PATH="mapbox/protozero"
-PROTOZERO_TAG=v1.6.2
+PROTOZERO_TAG=v1.7.1
 
 VTZERO_PATH="mapbox/vtzero"
 VTZERO_TAG=v1.1.0

third_party/protozero/.clang-tidy

@@ -1,8 +1,15 @@
 ---
-Checks: '*,-bugprone-signed-char-misuse,-cert-dcl21-cpp,-cert-err58-cpp,-cert-err60-cpp,-cppcoreguidelines-avoid-c-arrays,-cppcoreguidelines-avoid-magic-numbers,-cppcoreguidelines-macro-usage,-cppcoreguidelines-pro-bounds-pointer-arithmetic,-cppcoreguidelines-pro-bounds-array-to-pointer-decay,-cppcoreguidelines-pro-type-reinterpret-cast,-fuchsia-*,-google-runtime-references,-hicpp-avoid-c-arrays,-hicpp-no-array-decay,-hicpp-vararg,-modernize-avoid-c-arrays,-modernize-use-trailing-return-type,-readability-implicit-bool-conversion,-readability-magic-numbers'
+Checks: '*,-altera-*,-bugprone-easily-swappable-parameters,-bugprone-signed-char-misuse,-cert-dcl21-cpp,-cert-err58-cpp,-cert-err60-cpp,-cppcoreguidelines-avoid-c-arrays,-cppcoreguidelines-avoid-non-const-global-variables,-cppcoreguidelines-avoid-magic-numbers,-cppcoreguidelines-macro-usage,-cppcoreguidelines-pro-bounds-pointer-arithmetic,-cppcoreguidelines-pro-bounds-array-to-pointer-decay,-cppcoreguidelines-pro-type-reinterpret-cast,-fuchsia-*,-google-runtime-references,-hicpp-avoid-c-arrays,-hicpp-no-array-decay,-hicpp-vararg,-llvmlibc-*,-misc-no-recursion,-modernize-avoid-c-arrays,-modernize-use-trailing-return-type,-readability-function-cognitive-complexity,-readability-identifier-length,-readability-implicit-bool-conversion,-readability-magic-numbers'
 #
 # Disabled checks:
 #
+# altera-*
+# Doesn't apply.
+#
+# bugprone-easily-swappable-parameters
+# Can't change this any more, because these functions are part of our public
+# interface.
+#
 # bugprone-signed-char-misuse
 # Lots of warnings in varint.hpp otherwise.
 #
@@ -25,6 +32,9 @@ Checks: '*,-bugprone-signed-char-misuse,-cert-dcl21-cpp,-cert-err58-cpp,-cert-er
 # readability-magic-numbers
 # Good idea, but it goes too far to force this everywhere.
 #
+# cppcoreguidelines-avoid-non-const-global-variables
+# Getting these from Catch2 test framework, not from the code itself.
+#
 # cppcoreguidelines-macro-usage
 # There are cases where macros are simply needed.
 #
@@ -47,9 +57,21 @@ Checks: '*,-bugprone-signed-char-misuse,-cert-dcl21-cpp,-cert-err58-cpp,-cert-er
 # hicpp-no-array-decay
 # Limited use and many false positives including for all asserts.
 #
+# llvmlibc-*
+# Doesn't apply.
+#
+# misc-no-recursion
+# Nothing wrong with recursion.
+#
 # modernize-use-trailing-return-type
 # We are not quite that modern.
 #
+# readability-function-cognitive-complexity
+# Getting these mostly from Catch2 test framework.
+#
+# readability-identifier-length
+# Short identifiers do make sense sometimes.
+#
 # readability-implicit-bool-conversion
 # Not necessarily more readable.
 #

third_party/protozero/CHANGELOG.md

@@ -2,8 +2,8 @@
 # Changelog
 
 All notable changes to this project will be documented in this file.
-The format is based on [Keep a Changelog](http://keepachangelog.com/)
-This project adheres to [Semantic Versioning](http://semver.org/).
+The format is based on [Keep a Changelog](https://keepachangelog.com/)
+This project adheres to [Semantic Versioning](https://semver.org/).
 
 ## [unreleased] -
 
@@ -14,6 +14,24 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 ### Fixed
 
 
+## [1.7.1] - 2022-01-10
+
+### Changed
+
+- Don't build tests if the standard CMake `BUILD_TESTING` variable is set to
+ off.
+- Now needs CMake 3.5.0 or greater.
+- Update included catch2 framework to current version v2.13.8.
+- Only enable clang-tidy make target if protobuf was found.
+- Allow setting C++ version to compile with in CMake config.
+
+### Fixed
+
+- Fixes undefined behaviour in `float` and `double` byteswap.
+- Add missing includes of "config.hpp".
+- Avoid narrowing conversion by doing an explicit `static_cast`.
+
+
 ## [1.7.0] - 2020-06-08
 
 ### Added
@@ -381,7 +399,8 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - Make pbf reader and writer code endianess-aware.
 
 
-[unreleased]: https:/osmcode/libosmium/compare/v1.7.0...HEAD
+[unreleased]: https:/osmcode/libosmium/compare/v1.7.1...HEAD
+[1.7.1]: https:/osmcode/libosmium/compare/v1.7.0...v1.7.1
 [1.7.0]: https:/osmcode/libosmium/compare/v1.6.8...v1.7.0
 [1.6.8]: https:/osmcode/libosmium/compare/v1.6.7...v1.6.8
 [1.6.7]: https:/osmcode/libosmium/compare/v1.6.6...v1.6.7

third_party/protozero/CMakeLists.txt

@@ -6,32 +6,35 @@
 #
 #-----------------------------------------------------------------------------
 
-cmake_minimum_required(VERSION 2.8 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.5.0 FATAL_ERROR)
 
 #-----------------------------------------------------------------------------
 
-project(protozero)
+project(protozero VERSION 1.7.1 LANGUAGES CXX C)
 
-set(PROTOZERO_VERSION_MAJOR 1)
-set(PROTOZERO_VERSION_MINOR 7)
-set(PROTOZERO_VERSION_PATCH 0)
+set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
-set(PROTOZERO_VERSION
- "${PROTOZERO_VERSION_MAJOR}.${PROTOZERO_VERSION_MINOR}.${PROTOZERO_VERSION_PATCH}")
+#-----------------------------------------------------------------------------
 
-set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
+if (NOT "${CMAKE_CXX_STANDARD}")
+ set(CMAKE_CXX_STANDARD 11)
+endif()
+message(STATUS "Building in C++${CMAKE_CXX_STANDARD} mode")
+set(CMAKE_CXX_EXTENSIONS OFF)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 #-----------------------------------------------------------------------------
 
+option(BUILD_TESTING "Build tests" ON)
 option(WERROR "Add -Werror flag to build (turns warnings into errors)" ON)
 
 if(MSVC)
- add_definitions(/W3)
+ add_compile_options(/W3)
  add_definitions(-D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS)
 else()
- add_definitions(-std=c++11 -Wall -Wextra -pedantic -Wsign-compare -Wunused-parameter -Wno-float-equal -Wno-covered-switch-default)
+ add_compile_options(-Wall -Wextra -pedantic -Wsign-compare -Wunused-parameter -Wno-float-equal -Wno-covered-switch-default)
  if(WERROR)
- add_definitions(-Werror)
+ add_compile_options(-Werror)
  endif()
 endif()
 
@@ -58,9 +61,9 @@ find_package(Protobuf)
 #
 #-----------------------------------------------------------------------------
 message(STATUS "Looking for clang-tidy")
-find_program(CLANG_TIDY NAMES clang-tidy clang-tidy-10 clang-tidy-9 clang-tidy-8 clang-tidy-7 clang-tidy-6.0 clang-tidy-5.0)
+find_program(CLANG_TIDY NAMES clang-tidy clang-tidy-14 clang-tidy-13 clang-tidy-12 clang-tidy-11)
 
-if(CLANG_TIDY)
+if(CLANG_TIDY AND PROTOBUF_FOUND)
  message(STATUS "Looking for clang-tidy - found ${CLANG_TIDY}")
  add_custom_target(clang-tidy
  ${CLANG_TIDY}
@@ -134,13 +137,13 @@ install(DIRECTORY include/protozero DESTINATION include)
 
 #-----------------------------------------------------------------------------
 
-enable_testing()
-
 add_subdirectory(doc)
 
-add_subdirectory(tools)
-
-add_subdirectory(test)
+if(BUILD_TESTING)
+ enable_testing()
+ add_subdirectory(test)
+endif()
 
+add_subdirectory(tools)
 
 #-----------------------------------------------------------------------------

third_party/protozero/FUZZING.md

@@ -1,5 +1,5 @@
 
-To do fuzz testing using [AFL](http://lcamtuf.coredump.cx/afl/) compile with
+To do fuzz testing using [AFL](https://lcamtuf.coredump.cx/afl/) compile with
 the AFL compiler wrappers:
 
  mkdir build

third_party/protozero/README.md

@@ -11,7 +11,7 @@ changing frequently or lazy decoding is not critical for your application then
 this approach offers no value: just use the C++ API that can be generated with
 the Google Protobufs `protoc` program.
 
-[![Travis Build Status](https://travis-ci.org/mapbox/protozero.svg?branch=master)](https://travis-ci.org/mapbox/protozero)
+[![Travis Build Status](https://travis-ci.com/mapbox/protozero.svg?branch=master)](https://travis-ci.com/mapbox/protozero)
 [![Appveyor Build Status](https://ci.appveyor.com/api/projects/status/github/mapbox/protozero?svg=true)](https://ci.appveyor.com/project/Mapbox/protozero)
 [![Coverage Status](https://codecov.io/gh/mapbox/protozero/branch/master/graph/badge.svg)](https://codecov.io/gh/mapbox/protozero)
 [![Packaging status](https://repology.org/badge/tiny-repos/protozero.svg)](https://repology.org/metapackage/protozero)
@@ -123,7 +123,7 @@ You might have to set `CLANG_TIDY` in CMake config.
 
 ## Cppcheck
 
-For extra checks with [Cppcheck](http://cppcheck.sourceforge.net/) you can,
+For extra checks with [Cppcheck](https://cppcheck.sourceforge.io/) you can,
 after the CMake step, call
 
  make cppcheck

third_party/protozero/appveyor.yml

@@ -14,8 +14,6 @@ clone_depth: 1
 
 environment:
  matrix:
- - config: MSYS2
- autocrlf: true
  - config: Debug
  autocrlf: true
  - config: RelWithDebInfo
@@ -27,6 +25,9 @@ environment:
  - config: Debug
  autocrlf: false
  platform: x86
+ - config: MSYS2
+ autocrlf: true
+ APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
 
 #-----------------------------------------------------------------------------
 

third_party/protozero/bench/data/README.md

@@ -2,12 +2,12 @@
 
 mapbox-streets-v6/14/8714/8017.vector.pbf
 
- - http://c.tile.openstreetmap.org/14/8714/8017.png
+ - https://c.tile.openstreetmap.org/14/8714/8017.png
  - https://a.tiles.mapbox.com/v4/mapbox.mapbox-streets-v6/14/8714/8017.vector.pbf
  - https://www.mapbox.com/developers/vector-tiles/mapbox-streets/
 
 enf-14-4824-6157.vector.pbf
 
  - enf.8k273nmi
  - https://b.tiles.mapbox.com/v4/enf.c3a2de35/14/4824/[email protected]
- - https://www.mapbox.com/blog/twitter-map-every-tweet/
+ - https://www.mapbox.com/blog/twitter-map-every-tweet/