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
26 changes: 14 additions & 12 deletions .clang-tidy
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
---
Checks: >
clang-analyzer-*,
-clang-analyzer-optin.cplusplus.VirtualCall,
clang-diagnostic-*,
google-*,
misc-*,
-misc-non-private-member-variables-in-classes,
readability-*,
-readability-identifier-length,
-readability-magic-numbers,
Checks: [
clang-analyzer-*,
-clang-analyzer-optin.cplusplus.VirtualCall,
clang-diagnostic-*,
google-*,
misc-*,
-misc-non-private-member-variables-in-classes,
readability-*,
-readability-container-contains, # Removed for compatibility with C++17 which is used in ROS Humble
-readability-identifier-length,
-readability-magic-numbers,
]

CheckOptions:
misc-include-cleaner.IgnoreHeaders: bits/chrono.h
Expand All @@ -23,13 +25,13 @@ CheckOptions:
readability-identifier-naming.StaticConstantCase: lower_case
readability-identifier-naming.StaticVariableCase: lower_case
readability-identifier-naming.MacroDefinitionCase: UPPER_CASE
readability-identifier-naming.MacroDefinitionIgnoredRegexp: '^[A-Z]+(_[A-Z]+)*_$'
readability-identifier-naming.MacroDefinitionIgnoredRegexp: "^[A-Z]+(_[A-Z]+)*_$"
readability-identifier-naming.PrivateMemberCase: lower_case
readability-identifier-naming.ProtectedMemberCase: lower_case
readability-identifier-naming.PublicMemberCase: lower_case
readability-identifier-naming.PrivateMemberSuffix: _
readability-identifier-naming.ProtectedMemberSuffix: _
readability-identifier-naming.PublicMemberSuffix: ''
readability-identifier-naming.PublicMemberSuffix: ""
readability-identifier-naming.NamespaceCase: lower_case
readability-identifier-naming.ParameterCase: lower_case
readability-identifier-naming.TypeAliasCase: CamelCase
Expand Down
5 changes: 5 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,11 @@ jobs:
ROS_DISTRO: ${{ matrix.ROS_DISTRO }}
ROS_REPO: ${{ matrix.ROS_REPO }}
CMAKE_ARGS: ${{ matrix.ROS_DISTRO == 'rolling' && '-DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DENABLE_CLANG_TIDY=ON' || '' }}
# gcc-16 is installed on the rolling image alongside gcc-15 but without its
# libstdc++ headers, so clang-tidy (which auto-selects the newest GCC found)
# fails with "'chrono'/'string'/'memory' file not found". Installing
# libstdc++-16-dev fixes this.
ADDITIONAL_DEBS: ${{ matrix.ROS_DISTRO == 'rolling' && 'libstdc++-16-dev' || '' }}
steps:
- name: Checkout repo
uses: actions/checkout@v4
Expand Down
6 changes: 1 addition & 5 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.5)
cmake_minimum_required(VERSION 3.10)
project(web_video_server)

if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
Expand All @@ -25,10 +25,6 @@ pkg_check_modules(avformat libavformat REQUIRED)
pkg_check_modules(avutil libavutil REQUIRED)
pkg_check_modules(swscale libswscale REQUIRED)

Comment thread
bjsowa marked this conversation as resolved.
if(NOT CMAKE_CXX_STANDARD)
set(CMAKE_CXX_STANDARD 14)
endif()

###################################################
## Declare things to be passed to other projects ##
###################################################
Expand Down
1 change: 1 addition & 0 deletions src/streamers/image_transport_streamer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@
#include "image_transport/image_transport.hpp"
#include "rclcpp/node.hpp"
#include "rclcpp/logging.hpp"
#include "rclcpp/qos.hpp"
#include "rmw/qos_profiles.h"
#include "sensor_msgs/msg/image.hpp"

Expand Down
1 change: 0 additions & 1 deletion src/streamers/jpeg_streamers.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
#include <chrono>
#include <cstdint>
#include <cstdio>
#include <cstring>
#include <memory>
#include <mutex>
#include <string>
Expand Down
1 change: 0 additions & 1 deletion src/streamers/png_streamers.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
#include <chrono>
#include <cstdint>
#include <cstdio>
#include <cstring>
#include <memory>
#include <mutex>
#include <string>
Expand Down
1 change: 0 additions & 1 deletion src/streamers/vp8_streamer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ extern "C"
#include <libavutil/opt.h>
}

#include <cstring>
#include <map>
#include <memory>

Expand Down
1 change: 0 additions & 1 deletion src/streamers/vp9_streamer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ extern "C"
#include <libavutil/opt.h>
}

#include <cstring>
#include <memory>

#include "async_web_server_cpp/http_connection.hpp"
Expand Down
1 change: 0 additions & 1 deletion src/web_video_server.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@

#include <algorithm>
#include <chrono>
#include <cstring>
#include <exception>
#include <map>
#include <memory>
Expand Down
Loading