Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make compatible for GCC-7 #21

Merged
merged 1 commit into from
Dec 5, 2024
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
6 changes: 3 additions & 3 deletions .clang-format
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
BasedOnStyle: Google
AccessModifierOffset: -4
AllowAllArgumentsOnNextLine: false
AllowAllParametersOfDeclarationOnNextLine: false
AllowShortBlocksOnASingleLine: Never
AllowShortEnumsOnASingleLine: false
AllowShortFunctionsOnASingleLine: None
AllowShortLambdasOnASingleLine: None
BasedOnStyle: Chromium
BinPackArguments: false
BinPackParameters: false
ColumnLimit: 120
DerivePointerAlignment: false
IndentWidth: 4
InsertBraces: true
InsertNewlineAtEOF: true
99 changes: 50 additions & 49 deletions .clang-tidy
Original file line number Diff line number Diff line change
@@ -1,53 +1,54 @@
---
Checks: '*,
-altera-struct-pack-align,
-altera-unroll-loops,
-android-cloexec-accept,
-android-cloexec-socket,
-bugprone-easily-swappable-parameters,
-cert-err34-c,
-cert-err58-cpp,
-cert-msc30-c,
-cert-msc32-c,
-cert-msc50-cpp,
-cert-msc51-cpp,
-concurrency-mt-unsafe,
-cppcoreguidelines-avoid-c-arrays,
-cppcoreguidelines-avoid-do-while,
-cppcoreguidelines-avoid-magic-numbers,
-cppcoreguidelines-avoid-non-const-global-variables,
-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-vararg,
-cppcoreguidelines-pro-type-reinterpret-cast,
-fuchsia-default-arguments-calls,
-fuchsia-default-arguments-declarations,
-fuchsia-statically-constructed-objects,
-google-build-using-namespace,
-google-runtime-int,
-hicpp-avoid-c-arrays,
-hicpp-no-array-decay,
-hicpp-vararg,
-hicpp-signed-bitwise,
-llvmlibc-callee-namespace,
-llvmlibc-implementation-in-namespace,
-llvmlibc-restrict-system-libc-headers,
-misc-non-private-member-variables-in-classes,
-modernize-use-trailing-return-type,
-readability-function-cognitive-complexity,
-readability-identifier-length,
-readability-magic-numbers'
Checks: '*,
-altera-struct-pack-align,
-altera-unroll-loops,
-android-cloexec-accept,
-android-cloexec-socket,
-bugprone-easily-swappable-parameters,
-cert-err34-c,
-cert-err58-cpp,
-cert-msc30-c,
-cert-msc32-c,
-cert-msc50-cpp,
-cert-msc51-cpp,
-concurrency-mt-unsafe,
-cppcoreguidelines-avoid-c-arrays,
-cppcoreguidelines-avoid-do-while,
-cppcoreguidelines-avoid-magic-numbers,
-cppcoreguidelines-avoid-non-const-global-variables,
-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-vararg,
-cppcoreguidelines-pro-type-reinterpret-cast,
-fuchsia-default-arguments-calls,
-fuchsia-default-arguments-declarations,
-fuchsia-statically-constructed-objects,
-google-build-using-namespace,
-google-runtime-int,
-hicpp-avoid-c-arrays,
-hicpp-no-array-decay,
-hicpp-vararg,
-hicpp-signed-bitwise,
-llvm-include-order,
-llvmlibc-callee-namespace,
-llvmlibc-implementation-in-namespace,
-llvmlibc-restrict-system-libc-headers,
-misc-non-private-member-variables-in-classes,
-modernize-use-trailing-return-type,
-readability-function-cognitive-complexity,
-readability-identifier-length,
-readability-magic-numbers'

CheckOptions:
- { key: readability-identifier-naming.ClassCase, value: CamelCase }
- { key: readability-identifier-naming.PublicMethodCase, value: CamelCase }
- { key: readability-identifier-naming.ProtectedMethodCase, value: CamelCase }
- { key: readability-identifier-naming.PrivateMethodCase, value: CamelCase }
- { key: readability-identifier-naming.PrivateMemberCase, value: camelBack }
- { key: readability-identifier-naming.PrivateMemberPrefix, value: '_' }
- { key: readability-implicit-bool-conversion.AllowPointerConditions, value: 1}
- { key: readability-identifier-naming.ClassCase, value: CamelCase }
- { key: readability-identifier-naming.PublicMethodCase, value: CamelCase }
- { key: readability-identifier-naming.ProtectedMethodCase, value: CamelCase }
- { key: readability-identifier-naming.PrivateMethodCase, value: CamelCase }
- { key: readability-identifier-naming.PrivateMemberCase, value: camelBack }
- { key: readability-identifier-naming.PrivateMemberPrefix, value: '_' }
- { key: readability-implicit-bool-conversion.AllowPointerConditions, value: 1}
...
1 change: 1 addition & 0 deletions benchmark/BenchmarkBusBuffer.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// Copyright dSPACE GmbH. All rights reserved.

#include <benchmark/benchmark.h>

#include <string>
#include <thread>

Expand Down
1 change: 1 addition & 0 deletions benchmark/BenchmarkIoBuffer.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// Copyright dSPACE GmbH. All rights reserved.

#include <benchmark/benchmark.h>

#include <string>
#include <thread>

Expand Down
1 change: 1 addition & 0 deletions benchmark/Communication/BenchmarkChannel.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// Copyright dSPACE GmbH. All rights reserved.

#include <benchmark/benchmark.h>

#include <string>
#include <thread>
#include <vector>
Expand Down
1 change: 1 addition & 0 deletions benchmark/OsAbstraction/BenchmarkNamedEvent.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
#ifdef _WIN32

#include <benchmark/benchmark.h>

#include <string>
#include <thread>

Expand Down
1 change: 1 addition & 0 deletions benchmark/OsAbstraction/BenchmarkSocket.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// Copyright dSPACE GmbH. All rights reserved.

#include <benchmark/benchmark.h>

#include <string>
#include <thread>
#include <vector>
Expand Down
2 changes: 1 addition & 1 deletion compile_flags.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
-xc++
-std=c++20
-std=c++17
-DDSVEOSCOSIM_EXPORT
-DWIN32_LEAN_AND_MEAN
-D_CRT_SECURE_NO_WARNINGS
Expand Down
Loading
Loading