Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
8f8edf1
Added clang formatting configuration files
crhowell3 Apr 27, 2023
29852c9
Performed an initial clang format sweep on all files
crhowell3 Apr 27, 2023
62774f6
Some cpplint fixes for dis6
crhowell3 Apr 27, 2023
5e25186
Fixed build error, converted more primitive types to more modern 'cst…
crhowell3 Apr 27, 2023
6c8d33f
Fixed include statements in dis7
crhowell3 Apr 27, 2023
8a2caa0
Cpplint and clang updates for dis7
crhowell3 Apr 27, 2023
bc22034
Moving stuff around to organize the code
crhowell3 Jan 12, 2024
989f809
More restructuring
crhowell3 Jan 13, 2024
dd051ec
Moved all DIS6 PDUs into appropriate subdirectories, removed PDU file…
crhowell3 Jan 13, 2024
9e6f396
Distributed emissions CMake
crhowell3 Jan 13, 2024
ceac0d1
CMake for synthetic environment
crhowell3 Jan 15, 2024
907e801
Moved all source files within DIS6 into appropriate subdirectories
crhowell3 Jan 15, 2024
b70ea0e
Populated all DIS6 CMake files, reworked relative paths in common dir
crhowell3 Jan 17, 2024
300eb4c
[WIP] DIS7 reorganization
crhowell3 Jan 18, 2024
c70b84b
Moved all DIS7 source files into more organized dir structure
crhowell3 Jan 19, 2024
a64d1e6
[WIP]
crhowell3 Jan 19, 2024
7b9afec
Removed unnecessary OPENDIS6_EXPORT macro
crhowell3 Jan 19, 2024
029eb87
Lots of clang formatting fixes
crhowell3 Jan 21, 2024
9696d47
More clang cleanup
crhowell3 Jan 21, 2024
98953a1
Distributed emissions cleanup
crhowell3 Jan 22, 2024
7e63812
[WIP] syncing changes
crhowell3 Jan 23, 2024
96f4615
[WIP] continuing semantic improvements
crhowell3 Jan 23, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
23 changes: 23 additions & 0 deletions .clang-format
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# Use the Google style in this project.
BasedOnStyle: Google

# Some folks prefer to write "int& foo" while others prefer "int &foo". The
# Google Style Guide only asks for consistency within a project, we chose
# "int& foo" for this project:
DerivePointerAlignment: false
PointerAlignment: Left

# Rules for includes
# IncludeBlocks: IBS_Regroup # Requires clang-format 6.0+
# Ordering of includes, higher priority lower in list
IncludeCategories:
- Regex: '^\"unit/'
Priority: 5999
- Regex: '^\"'
Priority: 4000
- Regex: '^<.*/.*'
Priority: 2000
- Regex: '^<[^\/.]*>'
Priority: 1000
- Regex: '^<.*.h>'
Priority: 500
42 changes: 42 additions & 0 deletions .clang-tidy
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
---
# Configure clang-tidy for this project.

# Disabled:
# -clang-analyzer-cplusplus due to errors with the stl
# -google-readability-namespace-comments due to c++17 one line multinamespace
# -bugprone-suspicius-include does not support clang-tidy build styles
# -bugprone-easily-swappable-parameters often disallows simple functions
# -readability-function-cognitive-complexity disallows large functions
# -readability-identifier-length allows short variable names
# To be corrected:
Checks: '-*, bugprone-*, clang-*, google-readability-*, misc-*, modernize-*, readability-*, performance-*, -clang-analyzer-cplusplus*, -google-readability-namespace-comments, -bugprone-easily-swappable-parameters, -bugprone-suspicious-include, -readability-function-cognitive-complexity, -readability-identifier-length, -modernize-use-trailing-return-type'
# Most warnings should be errors
WarningsAsErrors: 'bugprone-*, clang-*, google-*, misc-*, modernize-*, readability-*, performance-*'
# Overall format style, Google Style Guide w/ extra restrictions
FormatStyle: file
CheckOptions:
- { key: readability-identifier-naming.ClassCase, value: CamelCase }
- { key: readability-identifier-naming.StructCase, value: CamelCase }
- { key: readability-identifier-naming.TemplateParameterCase, value: CamelCase }
- { key: readability-identifier-naming.FunctionCase, value: CamelCase }
- { key: readability-identifier-naming.NamespaceCase, value: lower_case }
- { key: readability-identifier-naming.VariableCase, value: lower_case }
- { key: readability-identifier-naming.LocalConstantCase, value: lower_case }
- { key: readability-identifier-naming.LocalConstantCase, value: lower_case }
- { key: readability-identifier-naming.GlobalVariableCase, value: lower_case }
- { key: readability-identifier-naming.GlobalVariableSuffix, value: _ }
- { key: readability-identifier-naming.GlobalConstantCase, value: CamelCase }
- { key: readability-identifier-naming.GlobalConstantPrefix, value: k }
- { key: readability-identifier-naming.PrivateMemberSuffix, value: _ }
- { key: readability-identifier-naming.PrivateMemberCase, value: lower_case }
- { key: readability-identifier-naming.ProtectedMemberSuffix, value: _ }
- { key: readability-identifier-naming.ProtectedMemberCase, value: lower_case }
- { key: readability-identifier-naming.ConstexprVariableCase, value: CamelCase }
- { key: readability-identifier-naming.ConstexprVariablePrefix, value: k }
- { key: readability-identifier-naming.EnumConstantCase, value: CamelCase }
- { key: readability-identifier-naming.EnumConstantPrefix, value: k }
- { key: readability-identifier-naming.MemberConstantCase, value: CamelCase }
- { key: readability-identifier-naming.MemberConstantPrefix, value: k }
- { key: readability-identifier-naming.StaticConstantCase, value: CamelCase }
- { key: readability-identifier-naming.StaticConstantPrefix, value: k }
- { key: readability-function-cognitive-complexity.Threshold, value: 35 }
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ CMakeFiles
cmake_install.cmake
CPackConfig.cmake
CPackSourceConfig.cmake

.cache
17 changes: 12 additions & 5 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.2)
cmake_minimum_required(VERSION 3.22)
project(OpenDIS VERSION 1.0.1)

# Build options
Expand All @@ -7,10 +7,12 @@ option(BUILD_EXAMPLES "build example sender/receiver applications" OFF)
option(BUILD_TESTS "build unit tests" OFF)

# Enforce a C++11 compliant compiler
set(CMAKE_CXX_STANDARD 11)
set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_EXTENSIONS OFF)

set(CMAKE_EXPORT_COMPILE_COMMANDS ON)

# include GNUInstallDirs Module to get more generic directory handling
include(GNUInstallDirs)

Expand All @@ -19,9 +21,14 @@ add_library(OpenDIS6 "")

# Add src/ to the include directories to OpenDIS6
target_include_directories(OpenDIS6
PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>
$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/src>
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
PUBLIC $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/src>
$<INSTALL_INTERFACE:${INSTALL_INCLUDE_DIR}>
)
target_include_directories(OpenDIS6 SYSTEM
PUBLIC $<BUILD_INTERFACE:${PROJECT_BINARY_DIR/src}>
$<INSTALL_INTERFACE:${INSTALL_INCLUDE_DIR}>
PRIVATE $<BUILD_INTERFACE:${CMRC_INCLUDE_DIR}>
)

# Define OpenDIS7 Library
add_library(OpenDIS7 "")
Expand Down
118 changes: 0 additions & 118 deletions src/dis6/AcknowledgePdu.cpp

This file was deleted.

81 changes: 0 additions & 81 deletions src/dis6/AcknowledgePdu.h

This file was deleted.

Loading