Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 16 additions & 1 deletion .clang-tidy
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
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'
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-*,-llvm-prefer-static-over-anonymous-namespace,-llvm-use-ranges,-misc-include-cleaner,-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,-readability-trailing-comma,-zircon-*'
#
# Disabled checks:
#
Expand Down Expand Up @@ -66,6 +66,15 @@ Checks: '*,-altera-*,-boost-use-ranges,-bugprone-chained-comparison,-bugprone-ea
# llvmlibc-*
# Doesn't apply.
#
# llvm-prefer-static-over-anonymous-namespace
# Not our style.
#
# llvm-use-ranges
# Not using the llvm library.
#
# misc-include-cleaner
# Doesn't work well enough in practice.
#
# misc-no-recursion
# Nothing wrong with recursion.
#
Expand All @@ -81,6 +90,12 @@ Checks: '*,-altera-*,-boost-use-ranges,-bugprone-chained-comparison,-bugprone-ea
# readability-implicit-bool-conversion
# Not necessarily more readable.
#
# readability-trailing-comma
# Not our style.
#
# zircon-*
# Does not apply.
#
#WarningsAsErrors: '*'
HeaderFilterRegex: '\/include\/'
...
12 changes: 6 additions & 6 deletions include/protozero/iterators.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -436,42 +436,42 @@ namespace std {
/// @cond individual overloads do not need to be documented

template <>
inline typename protozero::const_varint_iterator<int32_t>::difference_type
inline protozero::const_varint_iterator<int32_t>::difference_type
distance<protozero::const_varint_iterator<int32_t>>(protozero::const_varint_iterator<int32_t> first, // NOLINT(readability-inconsistent-declaration-parameter-name)
protozero::const_varint_iterator<int32_t> last) {
return protozero::const_varint_iterator<int32_t>::distance(first, last);
}

template <>
inline typename protozero::const_varint_iterator<int64_t>::difference_type
inline protozero::const_varint_iterator<int64_t>::difference_type
distance<protozero::const_varint_iterator<int64_t>>(protozero::const_varint_iterator<int64_t> first, // NOLINT(readability-inconsistent-declaration-parameter-name)
protozero::const_varint_iterator<int64_t> last) {
return protozero::const_varint_iterator<int64_t>::distance(first, last);
}

template <>
inline typename protozero::const_varint_iterator<uint32_t>::difference_type
inline protozero::const_varint_iterator<uint32_t>::difference_type
distance<protozero::const_varint_iterator<uint32_t>>(protozero::const_varint_iterator<uint32_t> first, // NOLINT(readability-inconsistent-declaration-parameter-name)
protozero::const_varint_iterator<uint32_t> last) {
return protozero::const_varint_iterator<uint32_t>::distance(first, last);
}

template <>
inline typename protozero::const_varint_iterator<uint64_t>::difference_type
inline protozero::const_varint_iterator<uint64_t>::difference_type
distance<protozero::const_varint_iterator<uint64_t>>(protozero::const_varint_iterator<uint64_t> first, // NOLINT(readability-inconsistent-declaration-parameter-name)
protozero::const_varint_iterator<uint64_t> last) {
return protozero::const_varint_iterator<uint64_t>::distance(first, last);
}

template <>
inline typename protozero::const_svarint_iterator<int32_t>::difference_type
inline protozero::const_svarint_iterator<int32_t>::difference_type
distance<protozero::const_svarint_iterator<int32_t>>(protozero::const_svarint_iterator<int32_t> first, // NOLINT(readability-inconsistent-declaration-parameter-name)
protozero::const_svarint_iterator<int32_t> last) {
return protozero::const_svarint_iterator<int32_t>::distance(first, last);
}

template <>
inline typename protozero::const_svarint_iterator<int64_t>::difference_type
inline protozero::const_svarint_iterator<int64_t>::difference_type
distance<protozero::const_svarint_iterator<int64_t>>(protozero::const_svarint_iterator<int64_t> first, // NOLINT(readability-inconsistent-declaration-parameter-name)
protozero::const_svarint_iterator<int64_t> last) {
return protozero::const_svarint_iterator<int64_t>::distance(first, last);
Expand Down
4 changes: 2 additions & 2 deletions test/t/repeated_packed_double/reader_test_cases.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -51,13 +51,13 @@ TEST_CASE("read repeated packed double field") {
REQUIRE(it == it_range.end());

it = it_range.begin();
auto it2 = it + 1;
const auto it2 = it + 1;
REQUIRE(it2 > it);
REQUIRE(it < it2);
REQUIRE(it <= it_range.begin());
REQUIRE(it >= it_range.begin());
REQUIRE(*it2 == Approx(0.0));
auto it3 = 1 + it;
const auto it3 = 1 + it;
REQUIRE(*it3 == Approx(0.0));
auto it4 = it2 - 1;
REQUIRE(*it4 == Approx(17.34));
Expand Down
4 changes: 2 additions & 2 deletions test/t/repeated_packed_float/reader_test_cases.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ TEST_CASE("read repeated packed float field") {
protozero::pbf_reader item{abuffer.data() + n, abuffer.size() - n};

REQUIRE(item.next());
auto it_range = item.get_packed_float();
const auto it_range = item.get_packed_float();
REQUIRE_FALSE(item.next());

REQUIRE(*it_range.begin() == Approx(17.34F));
Expand All @@ -39,7 +39,7 @@ TEST_CASE("read repeated packed float field") {
protozero::pbf_reader item{abuffer.data() + n, abuffer.size() - n};

REQUIRE(item.next());
auto it_range = item.get_packed_float();
const auto it_range = item.get_packed_float();
REQUIRE_FALSE(item.next());

auto it = it_range.begin();
Expand Down
2 changes: 1 addition & 1 deletion test/unit/test_varint.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -371,7 +371,7 @@ TEST_CASE("decode multiple varints in sequence") {

template <typename Decoder>
void test_overlong_varint_throws() {
std::string buffer(10, static_cast<char>(0xffU));
const std::string buffer(10, static_cast<char>(0xffU));
const char* b = buffer.data();
const char* const end = buffer.data() + buffer.size();
REQUIRE_THROWS_AS(Decoder::decode(&b, end), protozero::varint_too_long_exception);
Expand Down
2 changes: 1 addition & 1 deletion tools/pbf-decoder.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ bool decode_string(std::stringstream& out, const protozero::data_view view) {
template <typename TRange>
void print_number_range(std::stringstream& out, const TRange& range) {
bool first = true;
for (auto val : range) {
for (const auto val : range) {
if (first) {
first = false;
} else {
Expand Down
2 changes: 1 addition & 1 deletion tools/pbf-fuzzer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
// See https://github.com/google/benchmark/blob/main/LICENSE
template <class Tp>
inline __attribute__((always_inline)) void DoNotOptimize(Tp const& value) {
asm volatile("" : : "r,m"(value) : "memory");
asm volatile("" : : "r,m"(value) : "memory"); // NOLINT(hicpp-no-assembler,portability-no-assembler)
}

template <typename T>
Expand Down
Loading