Skip to content

Commit a8362d7

Browse files
akashihiakashihi
committed
Updated bundled protozero to v1.7.0
1 parent df3ed43 commit a8362d7

File tree

126 files changed

+18270
-10860
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

126 files changed

+18270
-10860
lines changed

‎CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
# Unreleased
2+
- Changes from 5.23.0
3+
- Infrastructure
4+
- CHANGED: Bundled protozero updated to v1.7.0. [#5858](https://github.com/Project-OSRM/osrm-backend/pull/5858)
25

36
# 5.23.0
47
- Changes from 5.22.0

‎third_party/protozero/.clang-tidy

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,33 @@
11
---
2-
Checks: '*,-cert-dcl21-cpp,-cert-err60-cpp,-cppcoreguidelines-pro-bounds-pointer-arithmetic,-cppcoreguidelines-pro-bounds-array-to-pointer-decay,-cppcoreguidelines-pro-type-reinterpret-cast,-fuchsia-*,-google-runtime-references,-hicpp-no-array-decay'
2+
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'
33
#
44
# Disabled checks:
55
#
6+
# bugprone-signed-char-misuse
7+
# Lots of warnings in varint.hpp otherwise.
8+
#
69
# cert-dcl21-cpp
710
# It is unclear whether this is still a good recommendation in modern C++.
811
#
12+
# cert-err58-cpp
13+
# Due to the Catch2 test framework.
14+
#
915
# cert-err60-cpp
1016
# Reports std::runtime_error as broken which we can't do anything about.
1117
#
18+
# cppcoreguidelines-avoid-c-arrays
19+
# hicpp-avoid-c-arrays
20+
# modernize-avoid-c-arrays
21+
# Makes sense for some array, but especially for char arrays using
22+
# std::array isn't a good solution.
23+
#
24+
# cppcoreguidelines-avoid-magic-numbers
25+
# readability-magic-numbers
26+
# Good idea, but it goes too far to force this everywhere.
27+
#
28+
# cppcoreguidelines-macro-usage
29+
# There are cases where macros are simply needed.
30+
#
1231
# cppcoreguidelines-pro-bounds-array-to-pointer-decay
1332
# Limited use and many false positives including for all asserts.
1433
#
@@ -28,6 +47,12 @@ Checks: '*,-cert-dcl21-cpp,-cert-err60-cpp,-cppcoreguidelines-pro-bounds-pointer
2847
# hicpp-no-array-decay
2948
# Limited use and many false positives including for all asserts.
3049
#
50+
# modernize-use-trailing-return-type
51+
# We are not quite that modern.
52+
#
53+
# readability-implicit-bool-conversion
54+
# Not necessarily more readable.
55+
#
3156
WarningsAsErrors: '*'
3257
HeaderFilterRegex: '\/include\/'
3358
AnalyzeTemporaryDtors: false

‎third_party/protozero/.travis.yml

Lines changed: 183 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -6,158 +6,272 @@
66

77
language: generic
88

9-
sudo: false
10-
11-
dist: trusty
12-
139
#-----------------------------------------------------------------------------
1410

1511
# Save common build configurations as shortcuts, so we can reference them later.
1612
addons_shortcuts:
1713
addons_clang35: &clang35
1814
apt:
1915
sources: [ 'ubuntu-toolchain-r-test', 'llvm-toolchain-trusty-3.5' ]
20-
packages: [ 'libprotobuf-dev','protobuf-compiler', 'clang-3.5' ]
16+
packages: [ 'libprotobuf-dev', 'protobuf-compiler', 'clang-3.5' ]
2117
addons_clang38: &clang38
2218
apt:
23-
sources: [ 'ubuntu-toolchain-r-test', 'llvm-toolchain-trusty-3.8' ]
24-
packages: [ 'libprotobuf-dev','protobuf-compiler', 'clang-3.8' ]
19+
packages: [ 'libprotobuf-dev', 'protobuf-compiler', 'clang-3.8' ]
2520
addons_clang39: &clang39
2621
apt:
27-
sources: [ 'ubuntu-toolchain-r-test', 'llvm-toolchain-trusty-3.9' ]
28-
packages: [ 'libprotobuf-dev','protobuf-compiler', 'clang-3.9' ]
22+
packages: [ 'libprotobuf-dev', 'protobuf-compiler', 'clang-3.9' ]
2923
addons_clang40: &clang40
3024
apt:
31-
sources: [ 'ubuntu-toolchain-r-test', 'llvm-toolchain-trusty-4.0' ]
32-
packages: [ 'libprotobuf-dev','protobuf-compiler', 'clang-4.0' ]
25+
sources: [ 'ubuntu-toolchain-r-test' ]
26+
packages: [ 'libprotobuf-dev', 'protobuf-compiler', 'clang-4.0' ]
3327
addons_clang50: &clang50
3428
apt:
35-
sources: [ 'ubuntu-toolchain-r-test', 'llvm-toolchain-trusty-5.0' ]
36-
packages: [ 'libprotobuf-dev','protobuf-compiler', 'clang-5.0', 'clang-tidy-5.0' ]
37-
addons_gcc47: &gcc47
29+
sources: [ 'ubuntu-toolchain-r-test' ]
30+
packages: [ 'libprotobuf-dev', 'protobuf-compiler', 'clang-5.0' ]
31+
addons_clang60: &clang60
3832
apt:
3933
sources: [ 'ubuntu-toolchain-r-test' ]
40-
packages: [ 'libprotobuf-dev','protobuf-compiler', 'g++-4.7', 'gcc-4.7' ]
34+
packages: [ 'libprotobuf-dev', 'protobuf-compiler', 'clang-6.0' ]
35+
addons_clang7: &clang7
36+
apt:
37+
packages: [ 'libprotobuf-dev', 'protobuf-compiler', 'clang-7' ]
38+
addons_clang8: &clang8
39+
apt:
40+
packages: [ 'libprotobuf-dev', 'protobuf-compiler', 'clang-8' ]
41+
addons_clang9: &clang9
42+
apt:
43+
packages: [ 'libprotobuf-dev', 'protobuf-compiler', 'clang-9', 'clang-tidy-9' ]
4144
addons_gcc48: &gcc48
4245
apt:
4346
sources: [ 'ubuntu-toolchain-r-test' ]
44-
packages: [ 'libprotobuf-dev','protobuf-compiler', 'g++-4.8', 'gcc-4.8' ]
47+
packages: [ 'libprotobuf-dev', 'protobuf-compiler', 'g++-4.8', 'gcc-4.8' ]
4548
addons_gcc49: &gcc49
4649
apt:
4750
sources: [ 'ubuntu-toolchain-r-test' ]
48-
packages: [ 'libprotobuf-dev','protobuf-compiler', 'g++-4.9', 'gcc-4.9' ]
51+
packages: [ 'libprotobuf-dev', 'protobuf-compiler', 'g++-4.9', 'gcc-4.9' ]
4952
addons_gcc5: &gcc5
5053
apt:
5154
sources: [ 'ubuntu-toolchain-r-test' ]
52-
packages: [ 'libprotobuf-dev','protobuf-compiler', 'g++-5', 'gcc-5' ]
55+
packages: [ 'libprotobuf-dev', 'protobuf-compiler', 'g++-5', 'gcc-5' ]
5356
addons_gcc6: &gcc6
5457
apt:
5558
sources: [ 'ubuntu-toolchain-r-test' ]
56-
packages: [ 'libprotobuf-dev','protobuf-compiler', 'g++-6', 'gcc-6' ]
59+
packages: [ 'libprotobuf-dev', 'protobuf-compiler', 'g++-6', 'gcc-6' ]
60+
addons_gcc7: &gcc7
61+
apt:
62+
packages: [ 'libprotobuf-dev', 'protobuf-compiler' ]
63+
addons_gcc8: &gcc8
64+
apt:
65+
packages: [ 'libprotobuf-dev', 'protobuf-compiler', 'g++-8', 'gcc-8' ]
5766

5867
#-----------------------------------------------------------------------------
5968

60-
matrix:
69+
jobs:
6170
include:
6271
- os: linux
72+
dist: trusty
6373
compiler: "clang-3.5"
64-
env: BUILD='Debug' CC=clang-3.5 CXX=clang++-3.5
74+
env: BUILD=Debug CC=clang-3.5 CXX=clang++-3.5
6575
addons: *clang35
76+
6677
- os: linux
78+
dist: xenial
6779
compiler: "clang-3.8"
68-
env: BUILD='Debug' CC=clang-3.8 CXX=clang++-3.8
80+
env: BUILD=Debug CC=clang-3.8 CXX=clang++-3.8
6981
addons: *clang38
82+
7083
- os: linux
84+
dist: xenial
7185
compiler: "clang-3.9"
72-
env: BUILD='Debug' CC=clang-3.9 CXX=clang++-3.9
86+
env: BUILD=Debug CC=clang-3.9 CXX=clang++-3.9
7387
addons: *clang39
88+
7489
- os: linux
90+
dist: xenial
7591
compiler: "clang-4.0"
76-
env: BUILD='Debug' CC=clang-4.0 CXX=clang++-4.0
92+
env: BUILD=Debug CC=clang-4.0 CXX=clang++-4.0
7793
addons: *clang40
94+
7895
- os: linux
96+
dist: xenial
7997
compiler: "clang-5.0"
80-
env: BUILD='Debug' CC=clang-5.0 CXX=clang++-5.0
81-
CLANG_TIDY=clang-tidy-5.0
98+
env: BUILD=Debug CC=clang-5.0 CXX=clang++-5.0
8299
addons: *clang50
100+
83101
- os: linux
84-
compiler: "clang-5.0"
85-
env: BUILD='Release' CC=clang-5.0 CXX=clang++-5.0
86-
addons: *clang50
102+
dist: xenial
103+
compiler: "clang-6.0"
104+
env: BUILD=Debug CC=clang-6.0 CXX=clang++-6.0
105+
addons: *clang60
106+
87107
- os: linux
88-
compiler: "clang-5.0"
89-
env: BUILD='Debug' CC=clang-5.0 CXX=clang++-5.0
108+
dist: bionic
109+
compiler: "clang-7"
110+
env: BUILD=Debug CC=clang-7 CXX=clang++-7
111+
addons: *clang7
112+
113+
- os: linux
114+
dist: bionic
115+
compiler: "clang-8"
116+
env: BUILD=Debug CC=clang-8 CXX=clang++-8
117+
addons: *clang8
118+
119+
- os: linux
120+
dist: bionic
121+
compiler: "clang-9"
122+
env: BUILD=Debug CC=clang-9 CXX=clang++-9
123+
CLANG_TIDY=clang-tidy-9
124+
addons: *clang9
125+
126+
- os: linux
127+
dist: bionic
128+
compiler: "clang-9"
129+
env: BUILD=Debug CC=clang-9 CXX=clang++-9
90130
CXXFLAGS="-fsanitize=address,undefined,integer -fno-sanitize-recover=all -fno-omit-frame-pointer"
91131
LDFLAGS="-fsanitize=address,undefined,integer"
92-
# LSAN doesn't work on container-based system
93-
sudo: required
94-
addons: *clang50
132+
addons: *clang9
133+
134+
- os: linux
135+
dist: bionic
136+
compiler: "clang-9"
137+
env: BUILD=Release CC=clang-9 CXX=clang++-9
138+
addons: *clang9
139+
95140
- os: linux
96-
compiler: "gcc-4.7"
97-
env: BUILD='Debug' CC=gcc-4.7 CXX=g++-4.7
98-
addons: *gcc47
141+
arch: arm64
142+
dist: bionic
143+
compiler: "clang-9"
144+
env: BUILD=Debug CC=clang-9 CXX=clang++-9
145+
CXXFLAGS="-fsanitize=address,undefined,integer -fno-sanitize-recover=all -fno-omit-frame-pointer"
146+
LDFLAGS="-fsanitize=address,undefined,integer"
147+
addons: *clang9
148+
99149
- os: linux
150+
arch: ppc64le
151+
dist: bionic
152+
compiler: "clang-9"
153+
env: BUILD=Debug CC=clang-9 CXX=clang++-9
154+
CXXFLAGS="-fsanitize=address,undefined,integer -fno-sanitize-recover=all -fno-omit-frame-pointer"
155+
LDFLAGS="-fsanitize=address,undefined,integer"
156+
addons: *clang9
157+
158+
- os: linux
159+
arch: s390x
160+
dist: bionic
161+
compiler: "clang-9"
162+
env: BUILD=Debug CC=clang-9 CXX=clang++-9
163+
CXXFLAGS="-fsanitize=address,undefined,integer -fno-sanitize-recover=all -fno-omit-frame-pointer"
164+
LDFLAGS="-fsanitize=address,undefined,integer"
165+
addons: *clang9
166+
167+
- os: linux
168+
dist: trusty
100169
compiler: "gcc-4.8"
101-
env: BUILD='Debug' CC=gcc-4.8 CXX=g++-4.8
170+
env: BUILD=Debug CC=gcc-4.8 CXX=g++-4.8
102171
addons: *gcc48
172+
103173
- os: linux
174+
dist: trusty
104175
compiler: "gcc-4.9"
105-
env: BUILD='Debug' CC=gcc-4.9 CXX=g++-4.9
106-
COVERAGE=gcov-4.9
107-
CXXFLAGS="--coverage" LDFLAGS="--coverage"
176+
env: BUILD=Debug CC=gcc-4.9 CXX=g++-4.9
108177
addons: *gcc49
178+
109179
- os: linux
180+
dist: trusty
110181
compiler: "gcc-5"
111-
env: BUILD='Debug' CC=gcc-5 CXX=g++-5
182+
env: BUILD=Debug CC=gcc-5 CXX=g++-5
112183
CXXFLAGS="-D_GLIBCXX_USE_CXX11_ABI=0"
113184
addons: *gcc5
185+
114186
- os: linux
187+
dist: xenial
115188
compiler: "gcc-5"
116-
env: BUILD='Debug' CC=gcc-5 CXX=g++-5
189+
env: BUILD=Debug CC=gcc-5 CXX=g++-5
117190
CXXFLAGS="-D_GLIBCXX_USE_CXX11_ABI=1"
118191
addons: *gcc5
192+
119193
- os: linux
194+
dist: xenial
120195
compiler: "gcc-6"
121-
env: BUILD='Debug' CC=gcc-6 CXX=g++-6
196+
env: BUILD=Debug CC=gcc-6 CXX=g++-6
122197
addons: *gcc6
198+
123199
- os: linux
124-
compiler: "gcc-6"
125-
env: BUILD='Debug' CC=gcc-6 CXX=g++-6
126-
PROTOZERO_DATA_VIEW=std::experimental::string_view
127-
addons: *gcc6
200+
dist: bionic
201+
compiler: "gcc-7"
202+
env: BUILD=Debug CC=gcc-7 CXX=g++-7
203+
addons: *gcc7
204+
128205
- os: linux
129-
compiler: "gcc-6"
130-
env: BUILD='Release' CC=gcc-6 CXX=g++-6
131-
addons: *gcc6
132-
- os: osx
133-
osx_image: xcode6.4
134-
compiler: clang
135-
env: BUILD='Debug'
206+
dist: bionic
207+
compiler: "gcc-8"
208+
env: BUILD=Debug CC=gcc-8 CXX=g++-8
209+
addons: *gcc8
210+
211+
- os: linux
212+
dist: bionic
213+
compiler: "gcc-8"
214+
env: BUILD=Debug CC=gcc-8 CXX=g++-8
215+
COVERAGE=gcov-8
216+
CXXFLAGS="--coverage" LDFLAGS="--coverage"
217+
addons: *gcc8
218+
219+
- os: linux
220+
dist: bionic
221+
compiler: "gcc-8"
222+
env: BUILD=Debug CC=gcc-8 CXX=g++-8
223+
PROTOZERO_DATA_VIEW=std::string_view
224+
addons: *gcc8
225+
226+
- os: linux
227+
dist: bionic
228+
compiler: "gcc-8"
229+
env: BUILD=Release CC=gcc-8 CXX=g++-8
230+
addons: *gcc8
231+
232+
- os: linux
233+
arch: arm64
234+
dist: bionic
235+
compiler: "gcc-8"
236+
env: BUILD=Debug CC=gcc-8 CXX=g++-8
237+
addons: *gcc8
238+
239+
- os: linux
240+
arch: ppc64le
241+
dist: bionic
242+
compiler: "gcc-8"
243+
env: BUILD=Debug CC=gcc-8 CXX=g++-8
244+
addons: *gcc8
245+
246+
- os: linux
247+
arch: s390x
248+
dist: bionic
249+
compiler: "gcc-8"
250+
env: BUILD=Debug CC=gcc-8 CXX=g++-8
251+
addons: *gcc8
252+
136253
- os: osx
137-
osx_image: xcode7.3
254+
osx_image: xcode9.4
138255
compiler: clang
139-
env: BUILD='Debug'
256+
env: BUILD=Debug
257+
140258
- os: osx
141-
osx_image: xcode8.3
259+
osx_image: xcode10.3
142260
compiler: clang
143-
env: BUILD='Debug'
261+
env: BUILD=Debug
262+
144263
- os: osx
145-
osx_image: xcode9.1
264+
osx_image: xcode11.4
146265
compiler: clang
147-
env: BUILD='Debug'
266+
env: BUILD=Debug
267+
148268
- os: osx
149-
osx_image: xcode9.1
269+
osx_image: xcode11.4
150270
compiler: clang
151-
env: BUILD='Release'
271+
env: BUILD=Release
152272

153273
#-----------------------------------------------------------------------------
154274

155-
install:
156-
- if [[ $(uname -s) == 'Darwin' ]]; then
157-
brew update;
158-
brew install protobuf;
159-
fi
160-
161275
script:
162276
- mkdir build
163277
- cd build

0 commit comments

Comments
 (0)