Skip to content

Commit e83f361

Browse files
afarberafarber
authored
Upgrade protozero from 1.7.1 to 1.8.1 (#7244)
1 parent 0ae940c commit e83f361

33 files changed

+769
-539
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ Thumbs.db
4747
/test/data/ch
4848
/test/data/mld
4949
/cmake/postinst
50+
.gradle/
5051

5152
# Eclipse related files #
5253
#########################

‎CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# Unreleased
22
- Changes from 6.0.0
33
- Misc:
4+
- CHANGED: Upgrade protozero from v1.7.1 to v1.8.1 [#7239](https://github.com/Project-OSRM/osrm-backend/pull/7239)
45
- CHANGED: Replace std::is_trivial with std::is_trivially_default_constructible && std::is_trivially_copyable [#7245](https://github.com/Project-OSRM/osrm-backend/issues/7245)
56
- ADDED: Add husky pre-commit hook for compiling and linting staged JS files [#7228](https://github.com/Project-OSRM/osrm-backend/issues/7228)
67
- CHANGED: Standardize linting configuration with ESM-specific rules [#7229](https://github.com/Project-OSRM/osrm-backend/issues/7229)

‎scripts/update_dependencies.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ set -o nounset
77
# Note: once the subtree merge from this script has been committed and pushed to
88
# a branch do not attempt to rebase the branch back onto master or the subdirectory
99
# structure will be lost.
10-
# http://git.661346.n2.nabble.com/subtree-merges-lose-prefix-after-rebase-td7332850.html
10+
# https://stackoverflow.com/questions/12858199/how-to-rebase-after-git-subtree-add
1111

1212
OSMIUM_PATH="osmcode/libosmium"
1313
OSMIUM_TAG=v2.20.0
@@ -22,7 +22,7 @@ MICROTAR_PATH="rxi/microtar"
2222
MICROTAR_TAG=v0.1.0
2323

2424
PROTOZERO_PATH="mapbox/protozero"
25-
PROTOZERO_TAG=v1.7.1
25+
PROTOZERO_TAG=v1.8.1
2626

2727
VTZERO_PATH="mapbox/vtzero"
2828
VTZERO_TAG=v1.1.0

‎third_party/protozero/.clang-tidy‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,17 @@
11
---
2-
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'
2+
Checks: '*,-altera-*,-boost-use-ranges,-bugprone-chained-comparison,-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'
33
#
44
# Disabled checks:
55
#
66
# altera-*
77
# Doesn't apply.
88
#
9+
# boost-use-ranges
10+
# Would introduce extra dependency on boost.
11+
#
12+
# bugprone-chained-comparison
13+
# These are generated by our test framework.
14+
#
915
# bugprone-easily-swappable-parameters
1016
# Can't change this any more, because these functions are part of our public
1117
# interface.
@@ -75,7 +81,6 @@ Checks: '*,-altera-*,-bugprone-easily-swappable-parameters,-bugprone-signed-char
7581
# readability-implicit-bool-conversion
7682
# Not necessarily more readable.
7783
#
78-
WarningsAsErrors: '*'
84+
#WarningsAsErrors: '*'
7985
HeaderFilterRegex: '\/include\/'
80-
AnalyzeTemporaryDtors: false
8186
...

‎third_party/protozero/.github/actions/build-windows/action.yml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
name: Build on Windows
2+
3+
runs:
4+
using: composite
5+
steps:
6+
- name: Build
7+
run: cmake --build . --config Release --verbose
8+
shell: bash
9+
working-directory: build
10+

‎third_party/protozero/.github/actions/build/action.yml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
name: Build
2+
3+
runs:
4+
using: composite
5+
steps:
6+
- name: Build
7+
run: make VERBOSE=1
8+
shell: bash
9+
working-directory: build
10+

‎third_party/protozero/.github/actions/cmake-windows/action.yml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
name: CMake on Windows
2+
3+
runs:
4+
using: composite
5+
steps:
6+
- name: Create build directory
7+
run: mkdir build
8+
shell: bash
9+
- name: Configure
10+
run: cmake -LA .. -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake
11+
shell: bash
12+
working-directory: build

‎third_party/protozero/.github/actions/cmake/action.yml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
name: CMake
2+
3+
runs:
4+
using: composite
5+
steps:
6+
- name: Create build directory
7+
run: mkdir build
8+
shell: bash
9+
- name: Configure
10+
run: |
11+
cmake -LA .. \
12+
-DCMAKE_BUILD_TYPE=${BUILD_TYPE} \
13+
-DPROTOZERO_DATA_VIEW=${PROTOZERO_DATA_VIEW} \
14+
-DCMAKE_CXX_STANDARD=${CPP_VERSION}
15+
shell: bash
16+
working-directory: build

‎third_party/protozero/.github/actions/ctest-windows/action.yml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
name: Test on Windows
2+
3+
runs:
4+
using: composite
5+
steps:
6+
- name: Test
7+
run: ctest --output-on-failure -C Release
8+
shell: bash
9+
working-directory: build
10+

‎third_party/protozero/.github/actions/ctest/action.yml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
name: Test
2+
3+
runs:
4+
using: composite
5+
steps:
6+
- name: Test
7+
run: ctest --output-on-failure
8+
shell: bash
9+
working-directory: build
10+

0 commit comments

Comments
 (0)