Merge pull request #21 from dspace-group/Gcc7

Make compatible for GCC-7
dspace-group · Dec 5, 2024 · d0554f9 · d0554f9
2 parents cc97060 + a3cc5b1
commit d0554f9
Show file tree

Hide file tree

Showing 44 changed files with 147 additions and 4,352 deletions.
diff --git a/.clang-format b/.clang-format
@@ -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
diff --git a/.clang-tidy b/.clang-tidy
@@ -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}
 ...
diff --git a/benchmark/BenchmarkBusBuffer.cpp b/benchmark/BenchmarkBusBuffer.cpp
@@ -1,6 +1,7 @@
 // Copyright dSPACE GmbH. All rights reserved.
 
 #include <benchmark/benchmark.h>
+
 #include <string>
 #include <thread>
 

diff --git a/benchmark/BenchmarkIoBuffer.cpp b/benchmark/BenchmarkIoBuffer.cpp
@@ -1,6 +1,7 @@
 // Copyright dSPACE GmbH. All rights reserved.
 
 #include <benchmark/benchmark.h>
+
 #include <string>
 #include <thread>
 

diff --git a/benchmark/Communication/BenchmarkChannel.cpp b/benchmark/Communication/BenchmarkChannel.cpp
@@ -1,6 +1,7 @@
 // Copyright dSPACE GmbH. All rights reserved.
 
 #include <benchmark/benchmark.h>
+
 #include <string>
 #include <thread>
 #include <vector>

diff --git a/benchmark/OsAbstraction/BenchmarkNamedEvent.cpp b/benchmark/OsAbstraction/BenchmarkNamedEvent.cpp
@@ -3,6 +3,7 @@
 #ifdef _WIN32
 
 #include <benchmark/benchmark.h>
+
 #include <string>
 #include <thread>
 

diff --git a/benchmark/OsAbstraction/BenchmarkSocket.cpp b/benchmark/OsAbstraction/BenchmarkSocket.cpp
@@ -1,6 +1,7 @@
 // Copyright dSPACE GmbH. All rights reserved.
 
 #include <benchmark/benchmark.h>
+
 #include <string>
 #include <thread>
 #include <vector>

diff --git a/compile_flags.txt b/compile_flags.txt
@@ -1,5 +1,5 @@
 -xc++
--std=c++20
+-std=c++17
 -DDSVEOSCOSIM_EXPORT
 -DWIN32_LEAN_AND_MEAN
 -D_CRT_SECURE_NO_WARNINGS