Skip to content

Commit 7fa46ad

Browse files
authored
Compile flags non-virtual-destructor (#3609)
* added compile flags * cleanup * cleanup * cleanup * add virtual destructors * uncrusify
1 parent 86e265f commit 7fa46ad

File tree

7 files changed

+20
-2
lines changed

7 files changed

+20
-2
lines changed

nav2_common/cmake/nav2_package.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ macro(nav2_package)
3737
endif()
3838

3939
if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
40-
add_compile_options(-Wall -Wextra -Wpedantic -Werror -Wdeprecated -fPIC)
40+
add_compile_options(-Wall -Wextra -Wpedantic -Werror -Wdeprecated -fPIC -Wnon-virtual-dtor)
4141
endif()
4242

4343
option(COVERAGE_ENABLED "Enable code coverage" FALSE)

nav2_core/include/nav2_core/behavior_tree_navigator.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ class NavigatorBase
117117
{
118118
public:
119119
NavigatorBase() = default;
120-
~NavigatorBase() = default;
120+
virtual ~NavigatorBase() = default;
121121

122122
/**
123123
* @brief Configuration of the navigator's backend BT and actions

nav2_dwb_controller/costmap_queue/include/costmap_queue/map_based_queue.hpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,11 @@ class MapBasedQueue
7070
reset();
7171
}
7272

73+
/**
74+
* @brief Default virtual Destructor
75+
*/
76+
virtual ~MapBasedQueue() = default;
77+
7378
/**
7479
* @brief Clear the queue
7580
*/

nav2_mppi_controller/include/nav2_mppi_controller/critic_manager.hpp

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,12 @@ class CriticManager
4747
*/
4848
CriticManager() = default;
4949

50+
51+
/**
52+
* @brief Virtual Destructor for mppi::CriticManager
53+
*/
54+
virtual ~CriticManager() = default;
55+
5056
/**
5157
* @brief Configure critic manager on bringup and load plugins
5258
* @param parent WeakPtr to node

nav2_mppi_controller/test/critic_manager_test.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,8 @@ class CriticManagerWrapper : public CriticManager
4646
CriticManagerWrapper()
4747
: CriticManager() {}
4848

49+
virtual ~CriticManagerWrapper() = default;
50+
4951
virtual void loadCritics()
5052
{
5153
critics_.clear();
@@ -78,6 +80,8 @@ class CriticManagerWrapperEnum : public CriticManager
7880
CriticManagerWrapperEnum()
7981
: CriticManager() {}
8082

83+
virtual ~CriticManagerWrapperEnum() = default;
84+
8185
unsigned int getCriticNum()
8286
{
8387
return critics_.size();

nav2_system_tests/src/behavior_tree/dummy_action_server.hpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ class DummyActionServer
5555
std::bind(&DummyActionServer::handle_accepted, this, _1));
5656
}
5757

58+
virtual ~DummyActionServer() = default;
5859
void setFailureRanges(const Ranges & failureRanges)
5960
{
6061
failure_ranges_ = failureRanges;

nav2_system_tests/src/behavior_tree/dummy_service.hpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,8 @@ class DummyService
4444
std::bind(&DummyService::handle_service, this, _1, _2, _3));
4545
}
4646

47+
virtual ~DummyService() = default;
48+
4749
void disable()
4850
{
4951
service_.reset();

0 commit comments

Comments
 (0)