Skip to content

Commit c99298c

Browse files
authored
Merge pull request #1454 from joto/clang-tidy-upd
Various clang-tidy updates
2 parents 7869a4e + 058076d commit c99298c

File tree

2 files changed

+12
-2
lines changed

2 files changed

+12
-2
lines changed

.clang-tidy

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
---
2-
Checks: '*,-android-cloexec-*,-cppcoreguidelines-avoid-magic-numbers,-cppcoreguidelines-owning-memory,-cppcoreguidelines-pro-bounds-array-to-pointer-decay,-cppcoreguidelines-pro-bounds-pointer-arithmetic,-cppcoreguidelines-pro-type-cstyle-cast,-cppcoreguidelines-pro-type-reinterpret-cast,-cppcoreguidelines-pro-type-static-cast-downcast,-cppcoreguidelines-pro-type-vararg,-fuchsia-*,-google-readability-casting,-google-readability-todo,-hicpp-no-array-decay,-hicpp-vararg,-llvm-include-order,-llvm-header-guard,-modernize-make-unique,-modernize-use-trailing-return-type,-readability-implicit-bool-conversion,-readability-named-parameter,-readability-magic-numbers'
2+
Checks: '*,-android-cloexec-*,-cppcoreguidelines-avoid-magic-numbers,-cppcoreguidelines-owning-memory,-cppcoreguidelines-pro-bounds-array-to-pointer-decay,-cppcoreguidelines-pro-bounds-pointer-arithmetic,-cppcoreguidelines-pro-type-cstyle-cast,-cppcoreguidelines-pro-type-reinterpret-cast,-cppcoreguidelines-pro-type-static-cast-downcast,-cppcoreguidelines-pro-type-vararg,-fuchsia-*,-google-readability-casting,-google-readability-todo,-hicpp-named-parameter,-hicpp-no-array-decay,-hicpp-vararg,-llvm-include-order,-llvm-header-guard,-llvmlibc-*,-misc-no-recursion,-modernize-make-unique,-modernize-use-trailing-return-type,-readability-implicit-bool-conversion,-readability-named-parameter,-readability-magic-numbers'
33
#
44
# cppcoreguidelines-pro-type-cstyle-cast
55
# google-build-using-namespace
66
# google-readability-casting
77
# llvm-include-order
8+
# hicpp-named-parameter
89
# readability-named-parameter
910
# Differ from our style guidelines
1011
#
@@ -35,6 +36,12 @@ Checks: '*,-android-cloexec-*,-cppcoreguidelines-avoid-magic-numbers,-cppcoregui
3536
# llvm-header-guard
3637
# Not our style
3738
#
39+
# llvmlibc-*
40+
# Not applicable
41+
#
42+
# misc-no-recursion
43+
# Nothing wrong with recursion
44+
#
3845
# modernize-make-unique
3946
# Not available in C++11
4047
#
@@ -46,4 +53,7 @@ Checks: '*,-android-cloexec-*,-cppcoreguidelines-avoid-magic-numbers,-cppcoregui
4653
#
4754
#WarningsAsErrors: '*'
4855
HeaderFilterRegex: '\/src\/'
56+
CheckOptions:
57+
- key: cppcoreguidelines-special-member-functions.AllowSoleDefaultDtor
58+
value: true
4959
...

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@ target_link_libraries(osm2pgsql osm2pgsql_lib ${LIBS})
292292

293293
message(STATUS "Looking for clang-tidy")
294294
find_program(CLANG_TIDY
295-
NAMES clang-tidy clang-tidy-10 clang-tidy-9 clang-tidy-8 clang-tidy-7)
295+
NAMES clang-tidy clang-tidy-12 clang-tidy-11 clang-tidy-10 clang-tidy-9 clang-tidy-8 clang-tidy-7)
296296

297297
if (CLANG_TIDY)
298298
message(STATUS "Looking for clang-tidy - found ${CLANG_TIDY}")

0 commit comments

Comments
 (0)