Merge pull request #5884 from dburnsii/upgrade_libosmium_v2.15.6

Upgrade libosmium to v2.15.6

third_party/libosmium/.clang-tidy

@@ -1,21 +1,45 @@
 ---
-Checks: '*,-android-cloexec-*,-cert-dcl21-cpp,-cert-err58-cpp,-cppcoreguidelines-owning-memory,-cppcoreguidelines-pro-bounds-array-to-pointer-decay,-cppcoreguidelines-pro-bounds-constant-array-index,-cppcoreguidelines-pro-bounds-pointer-arithmetic,-cppcoreguidelines-pro-type-const-cast,-cppcoreguidelines-pro-type-reinterpret-cast,-cppcoreguidelines-pro-type-static-cast-downcast,-cppcoreguidelines-pro-type-vararg,-fuchsia-*,-google-runtime-references,-hicpp-invalid-access-moved,-hicpp-no-array-decay,-hicpp-no-assembler,-hicpp-vararg,-misc-macro-parentheses,-misc-unused-parameters,-modernize-make-unique,-modernize-raw-string-literal,-readability-avoid-const-params-in-decls,-readability-implicit-bool-cast,-readability-implicit-bool-conversion'
+Checks: '*,-android-cloexec-*,-bugprone-branch-clone,-bugprone-macro-parentheses,-cert-dcl21-cpp,-cert-err58-cpp,-clang-analyzer-optin.cplusplus.VirtualCall,-cppcoreguidelines-avoid-c-arrays,-cppcoreguidelines-avoid-magic-numbers,-cppcoreguidelines-macro-usage,-cppcoreguidelines-non-private-member-variables-in-classes,-cppcoreguidelines-owning-memory,-cppcoreguidelines-pro-bounds-array-to-pointer-decay,-cppcoreguidelines-pro-bounds-constant-array-index,-cppcoreguidelines-pro-bounds-pointer-arithmetic,-cppcoreguidelines-pro-type-const-cast,-cppcoreguidelines-pro-type-reinterpret-cast,-cppcoreguidelines-pro-type-static-cast-downcast,-cppcoreguidelines-pro-type-vararg,-fuchsia-*,-google-runtime-references,-hicpp-avoid-c-arrays,-hicpp-invalid-access-moved,-hicpp-no-array-decay,-hicpp-no-assembler,-hicpp-vararg,-misc-macro-parentheses,-misc-non-private-member-variables-in-classes,-misc-unused-parameters,-modernize-avoid-c-arrays,-modernize-make-unique,-modernize-raw-string-literal,-modernize-use-trailing-return-type,-readability-avoid-const-params-in-decls,-readability-implicit-bool-cast,-readability-implicit-bool-conversion,-readability-magic-numbers'
 #
 #  For a list of check options, see:
-#  http://clang.llvm.org/extra/clang-tidy/checks/list.html
+#  https://clang.llvm.org/extra/clang-tidy/checks/list.html
 #
 #  Disabled checks:
 #
 #  android-cloexec-*
 #    O_CLOEXEC isn't available on Windows making this non-portable.
 #
+#  bugprone-branch-clone
+#    Nice idea but collides but with switch statements we'll need to use
+#    fall-throughs to fix this, which is also bad.
+#
+#  bugprone-macro-parentheses
+#    False positive in the only place where it reports something and
+#    disabling locally doesn't work.
+#
 #  cert-dcl21-cpp
 #    It is unclear whether this is still a good recommendation in modern C++.
 #
 #  cert-err58-cpp
 #    Used in several singelton factory functions. I don't know of a better
 #    way to do this and it is rather unlikely that this will be a problem.
 #
+#  clang-analyzer-optin.cplusplus.VirtualCall
+#    Disable a warning we get from the Catch test framework.
+#
+#  cppcoreguidelines-avoid-c-arrays
+#    Alias for modernize-avoid-c-arrays.
+#
+#  cppcoreguidelines-avoid-magic-numbers
+#    Generally good advice, but there are too many places where this is
+#    useful, for instance in tests.
+#
+#  cppcoreguidelines-macro-usage
+#    There are cases where we actually need macros.
+#
+#  cppcoreguidelines-non-private-member-variables-in-classes
+#    Alias for misc-non-private-member-variables-in-classes
+#
 #  cppcoreguidelines-owning-memory
 #    Don't want to add dependency on gsl library.
 #
@@ -48,6 +72,9 @@ Checks: '*,-android-cloexec-*,-cert-dcl21-cpp,-cert-err58-cpp,-cppcoreguidelines
 #    This is just a matter of preference, and we can't change the interfaces
 #    now anyways.
 #
+#  hicpp-avoid-c-arrays
+#    Alias for modernize-avoid-c-arrays.
+#
 #  hicpp-invalid-access-moved
 #    Creates false positives.
 #
@@ -61,20 +88,31 @@ Checks: '*,-android-cloexec-*,-cert-dcl21-cpp,-cert-err58-cpp,-cppcoreguidelines
 #    Too strict, sometimes calling vararg functions is necessary.
 #
 #  misc-macro-parentheses
-#    False positive in the only place where it reports something and
-#    disabling locally doesn't work.
+#    Old name for bugprone-macro-parentheses.
+#
+#  misc-non-private-member-variables-in-classes
+#    Reports this also for structs, which doesn't make any sense. There is
+#    an option "IgnoreClassesWithAllMemberVariablesBeingPublic" which should
+#    disable this, but it didn't work for me.
 #
 #  misc-unused-parameters
 #    Can't be fixed, because then Doxygen will complain. (In file
 #    include/osmium/area/problem_reporter.hpp).
 #
+#  modernize-avoid-c-arrays
+#    Makes sense for some array, but especially for char arrays using
+#    std::array isn't a good solution.
+#
 #  modernize-make-unique
 #    This is a C++11 library and C++ doesn't have std::make_unique.
 #
 #  modernize-raw-string-literal
 #    Readability isn't that much better, arguably worse because of the new
 #    syntax.
 #
+#  modernize-use-trailing-return-type
+#    I am not quite that modern.
+#
 #  readability-avoid-const-params-in-decls
 #    This is header only library, so the declaration and implementation are
 #    often the same and we want to have the const in implementations.
@@ -85,6 +123,9 @@ Checks: '*,-android-cloexec-*,-cert-dcl21-cpp,-cert-err58-cpp,-cppcoreguidelines
 #  readability-implicit-bool-conversion
 #    I don't think this makes the code more readable.
 #
+#  readability-magic-numbers
+#    Alias for cppcoreguidelines-avoid-magic-numbers.
+#
 #WarningsAsErrors: '*'
 HeaderFilterRegex: '\/include\/osmium\/.*'
 ...

third_party/libosmium/.travis.yml

@@ -4,11 +4,11 @@
 #
 #-----------------------------------------------------------------------------
 
-language: generic
+os: linux
 
-sudo: false
+dist: xenial
 
-dist: trusty
+language: generic
 
 #-----------------------------------------------------------------------------
 
@@ -32,190 +32,171 @@ addons_shortcuts:
       packages: [ 'libboost1.55-all-dev', 'libgdal-dev', 'libproj-dev', 'libsparsehash-dev', 'spatialite-bin', 'clang-3.5']
   addons_clang38: &clang38
     apt:
-      sources: [ 'ubuntu-toolchain-r-test', 'boost-latest' ]
-      packages: [ 'libboost1.55-all-dev', 'libgdal-dev', 'libproj-dev', 'libsparsehash-dev', 'spatialite-bin', 'clang-3.8']
+      packages: [ 'libboost-all-dev', 'libgdal-dev', 'libproj-dev', 'libsparsehash-dev', 'spatialite-bin', 'clang-3.8']
   addons_clang39: &clang39
     apt:
-      sources: [ 'ubuntu-toolchain-r-test', 'boost-latest' ]
-      packages: [ 'libboost1.55-all-dev', 'libgdal-dev', 'libproj-dev', 'libsparsehash-dev', 'spatialite-bin', 'clang-3.9']
-  addons_clang40: &clang40
-    apt:
-      sources: [ 'ubuntu-toolchain-r-test', 'boost-latest', 'llvm-toolchain-trusty-4.0' ]
-      packages: [ 'libboost1.55-all-dev', 'libgdal-dev', 'libproj-dev', 'libsparsehash-dev', 'spatialite-bin', 'clang-4.0']
+      packages: [ 'libboost-all-dev', 'libgdal-dev', 'libproj-dev', 'libsparsehash-dev', 'spatialite-bin', 'clang-3.9']
   addons_clang50: &clang50
     apt:
-      sources: [ 'ubuntu-toolchain-r-test', 'boost-latest', 'llvm-toolchain-trusty-5.0' ]
-      packages: [ 'libboost1.55-all-dev', 'libgdal-dev', 'libproj-dev', 'libsparsehash-dev', 'spatialite-bin', 'clang-5.0', 'g++-6', 'gcc-6']
+      sources: [ 'ubuntu-toolchain-r-test' ]
+      packages: [ 'libboost-all-dev', 'libgdal-dev', 'libproj-dev', 'libsparsehash-dev', 'spatialite-bin', 'clang-5.0', 'g++-6', 'gcc-6']
+  addons_clang60: &clang60
+    apt:
+      sources: [ 'ubuntu-toolchain-r-test' ]
+      packages: [ 'libboost-all-dev', 'libgdal-dev', 'libproj-dev', 'libsparsehash-dev', 'spatialite-bin', 'clang-6.0', 'g++-6', 'gcc-6']
+  addons_clang7: &clang7
+    apt:
+      packages: [ 'libboost-all-dev', 'libgdal-dev', 'libproj-dev', 'libsparsehash-dev', 'spatialite-bin', 'clang-7' ]
   addons_gcc48: &gcc48
     apt:
-      sources: [ 'ubuntu-toolchain-r-test', 'boost-latest' ]
-      packages: [ 'libboost1.55-all-dev', 'libgdal-dev', 'libproj-dev', 'libsparsehash-dev', 'spatialite-bin', 'g++-4.8', 'gcc-4.8' ]
+      packages: [ 'libboost-all-dev', 'libgdal-dev', 'libproj-dev', 'libsparsehash-dev', 'spatialite-bin', 'g++-4.8', 'gcc-4.8' ]
   addons_gcc49: &gcc49
     apt:
-      sources: [ 'ubuntu-toolchain-r-test', 'boost-latest' ]
-      packages: [ 'libboost1.55-all-dev', 'libgdal-dev', 'libproj-dev', 'libsparsehash-dev', 'spatialite-bin', 'g++-4.9', 'gcc-4.9' ]
+      packages: [ 'libboost-all-dev', 'libgdal-dev', 'libproj-dev', 'libsparsehash-dev', 'spatialite-bin', 'g++-4.9', 'gcc-4.9' ]
   addons_gcc5: &gcc5
     apt:
-      sources: [ 'ubuntu-toolchain-r-test', 'boost-latest' ]
-      packages: [ 'libboost1.55-all-dev', 'libgdal-dev', 'libproj-dev', 'libsparsehash-dev', 'spatialite-bin', 'g++-5', 'gcc-5' ]
+      packages: [ 'libboost-all-dev', 'libgdal-dev', 'libproj-dev', 'libsparsehash-dev', 'spatialite-bin', 'g++-5', 'gcc-5' ]
   addons_gcc6: &gcc6
     apt:
-      sources: [ 'ubuntu-toolchain-r-test', 'boost-latest' ]
-      packages: [ 'libboost1.55-all-dev', 'libgdal-dev', 'libproj-dev', 'libsparsehash-dev', 'spatialite-bin', 'g++-6', 'gcc-6' ]
+      sources: [ 'ubuntu-toolchain-r-test' ]
+      packages: [ 'libboost-all-dev', 'libgdal-dev', 'libproj-dev', 'libsparsehash-dev', 'spatialite-bin', 'g++-6', 'gcc-6' ]
+  addons_gcc7: &gcc7
+    apt:
+      packages: [ 'libboost-all-dev', 'libgdal-dev', 'libproj-dev', 'libsparsehash-dev', 'spatialite-bin' ]
 
 #-----------------------------------------------------------------------------
 
-matrix:
-  include:
+addons:
+  homebrew:
+    packages:
+      - cmake
+      - boost
+      - google-sparsehash
+      - gdal
+    update: true
 
-    # 1/ Linux Clang Builds
-    - os: linux
-      compiler: linux-clang35-release
-      env: CC='clang-3.5' CXX='clang++-3.5' BUILD_TYPE='Release'
-      addons: *clang35
+#-----------------------------------------------------------------------------
+
+jobs:
+  include:
 
+    # Linux Clang Builds
     - os: linux
       compiler: linux-clang35-dev
       env: CC='clang-3.5' CXX='clang++-3.5' BUILD_TYPE='Dev'
       addons: *clang35
-
-    - os: linux
-      compiler: linux-clang38-release
-      env: CC='clang-3.8' CXX='clang++-3.8' BUILD_TYPE='Release'
-      addons: *clang38
+      dist: trusty
 
     - os: linux
       compiler: linux-clang38-dev
       env: CC='clang-3.8' CXX='clang++-3.8' BUILD_TYPE='Dev'
       addons: *clang38
 
-    - os: linux
-      compiler: linux-clang39-release
-      env: CC='clang-3.9' CXX='clang++-3.9' BUILD_TYPE='Release'
-      addons: *clang39
-
     - os: linux
       compiler: linux-clang39-dev
       env: CC='clang-3.9' CXX='clang++-3.9' BUILD_TYPE='Dev'
       addons: *clang39
 
     - os: linux
-      compiler: linux-clang40-release
-      env: CC='clang-4.0' CXX='clang++-4.0' BUILD_TYPE='Release'
-      addons: *clang40
+      compiler: linux-clang50-dev
+      env: CC='clang-5.0' CXX='clang++-5.0' BUILD_TYPE='Dev'
+      addons: *clang50
 
     - os: linux
-      compiler: linux-clang40-dev
-      env: CC='clang-4.0' CXX='clang++-4.0' BUILD_TYPE='Dev'
-      addons: *clang40
+      compiler: linux-clang60-dev
+      env: CC='clang-6.0' CXX='clang++-6.0' BUILD_TYPE='Dev'
+      addons: *clang60
 
     - os: linux
-      compiler: linux-clang50-release
-      env: CC='clang-5.0' CXX='clang++-5.0' BUILD_TYPE='Release'
-      addons: *clang50
+      compiler: linux-clang60-debug
+      env: CC='clang-6.0' CXX='clang++-6.0' BUILD_TYPE='Debug'
+           CXXFLAGS="-fsanitize=address,undefined,integer -fno-sanitize-recover=all -fno-omit-frame-pointer"
+           LDFLAGS="-fsanitize=address,undefined,integer"
+      addons: *clang60
 
     - os: linux
-      compiler: linux-clang50-dev
-      env: CC='clang-5.0' CXX='clang++-5.0' BUILD_TYPE='Dev'
-      addons: *clang50
+      compiler: linux-clang60-release
+      env: CC='clang-6.0' CXX='clang++-6.0' BUILD_TYPE='Release'
+      addons: *clang60
 
-# Disabled because it creates false-positives on the old travis systems
-#    - os: linux
-#      compiler: linux-clang50-debug
-#      env: CC='clang-5.0' CXX='clang++-5.0' BUILD_TYPE='Debug'
-#           CXXFLAGS="-fsanitize=address,undefined,integer -fno-sanitize-recover=all -fno-omit-frame-pointer"
-#           LDFLAGS="-fsanitize=address,undefined,integer"
-#      # LSAN doesn't work on container-based system
-#      sudo: required
-#      addons: *clang50
+    - os: linux
+      compiler: linux-clang7-debug
+      env: CC='clang-7' CXX='clang++-7' BUILD_TYPE='Debug'
+           CXXFLAGS="-fsanitize=address,undefined,integer -fno-sanitize-recover=all -fno-omit-frame-pointer"
+           LDFLAGS="-fsanitize=address,undefined,integer"
+      addons: *clang7
+      dist: bionic
 
-    # 2/ Linux GCC Builds
     - os: linux
-      compiler: linux-gcc48-release
-      env: CC='gcc-4.8' CXX='g++-4.8' BUILD_TYPE='Release'
-           CXXFLAGS='-Wno-return-type'
-      addons: *gcc48
+      compiler: linux-clang7-release
+      env: CC='clang-7' CXX='clang++-7' BUILD_TYPE='Release'
+      addons: *clang7
+      dist: bionic
 
+    # Linux GCC Builds
     - os: linux
       compiler: linux-gcc48-dev
       env: CC='gcc-4.8' CXX='g++-4.8' BUILD_TYPE='Dev'
            CXXFLAGS='-Wno-return-type'
       addons: *gcc48
 
-    - os: linux
-      compiler: linux-gcc49-release
-      env: CC='gcc-4.9' CXX='g++-4.9' BUILD_TYPE='Release'
-      addons: *gcc49
-
     - os: linux
       compiler: linux-gcc49-dev
       env: CC='gcc-4.9' CXX='g++-4.9' BUILD_TYPE='Dev'
       addons: *gcc49
 
-    - os: linux
-      compiler: linux-gcc5-release
-      env: CC='gcc-5' CXX='g++-5' BUILD_TYPE='Release'
-      addons: *gcc5
-
     - os: linux
       compiler: linux-gcc5-dev
       env: CC='gcc-5' CXX='g++-5' BUILD_TYPE='Dev'
       addons: *gcc5
 
-    - os: linux
-      compiler: linux-gcc6-release
-      env: CC='gcc-6' CXX='g++-6' BUILD_TYPE='Release'
-      addons: *gcc6
-
     - os: linux
       compiler: linux-gcc6-dev
       env: CC='gcc-6' CXX='g++-6' BUILD_TYPE='Dev'
       addons: *gcc6
 
     - os: linux
-      compiler: linux-gcc6-coverage
-      env: CC='gcc-6' CXX='g++-6' BUILD_TYPE='Coverage'
-      addons: *gcc6
+      compiler: linux-gcc7-dev
+      env: CC='gcc-7' CXX='g++-7' BUILD_TYPE='Dev'
+      addons: *gcc7
+      dist: bionic
 
-    # 3/ OSX Clang Builds
-    - os: osx
-      osx_image: xcode6.4
-      compiler: xcode64-clang-release
-      env: CC='clang' CXX='clang++' BUILD_TYPE='Release'
+    - os: linux
+      compiler: linux-gcc7-coverage
+      env: CC='gcc-7' CXX='g++-7' BUILD_TYPE='Coverage'
+      addons: *gcc7
+      dist: bionic
+
+    - os: linux
+      compiler: linux-gcc7-release
+      env: CC='gcc-7' CXX='g++-7' BUILD_TYPE='Release'
+      addons: *gcc7
+      dist: bionic
 
+    # OSX Clang Builds
     - os: osx
-      osx_image: xcode6.4
-      compiler: xcode64-clang-dev
+      osx_image: xcode9.4
+      compiler: xcode94-clang-dev
       env: CC='clang' CXX='clang++' BUILD_TYPE='Dev'
 
     - os: osx
-      osx_image: xcode7
-      compiler: xcode7-clang-release
-      env: CC='clang' CXX='clang++' BUILD_TYPE='Release'
+      osx_image: xcode10.2
+      compiler: xcode10-clang-dev
+      env: CC='clang' CXX='clang++' BUILD_TYPE='Dev'
 
     - os: osx
-      osx_image: xcode7
-      compiler: xcode7-clang-dev
+      osx_image: xcode11
+      compiler: xcode11-clang-dev
       env: CC='clang' CXX='clang++' BUILD_TYPE='Dev'
 
     - os: osx
-      osx_image: xcode8.3
-      compiler: xcode8-clang-release
+      osx_image: xcode11
+      compiler: xcode11-clang-release
       env: CC='clang' CXX='clang++' BUILD_TYPE='Release'
 
-    - os: osx
-      osx_image: xcode8.3
-      compiler: xcode8-clang-dev
-      env: CC='clang' CXX='clang++' BUILD_TYPE='Dev'
-
 
 install:
   - git clone --quiet --depth 1 https://github.com/mapbox/protozero.git ../protozero
-  - |
-    if [[ "${TRAVIS_OS_NAME}" == "osx" ]]; then
-      brew remove gdal
-      brew install cmake boost google-sparsehash gdal || true
-    fi
   - cmake --version
 
 before_script: