Skip to content

Commit 5a8ffa6

Browse files
committed
Linting, especially include order
Signed-off-by: Nordmann Arne (CR/ADT3) <arne.nordmann@de.bosch.com>
1 parent 64296ff commit 5a8ffa6

7 files changed

Lines changed: 17 additions & 21 deletions

File tree

CPPLINT.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
set noparent
2-
filter=-build/include_order,-build/header_guard,-runtime/string
2+
filter=-build/header_guard,-runtime/string

system_modes/src/mode_manager_node.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ using lifecycle_msgs::msg::TransitionEvent;
4747
using rcl_interfaces::msg::ParameterType;
4848
using rcl_interfaces::msg::ParameterEvent;
4949

50-
string modelfile, loglevel;
5150
shared_ptr<ModeManager> manager;
5251

5352
void transition_callback(

system_modes/src/mode_monitor_node.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,6 @@ using lifecycle_msgs::msg::TransitionEvent;
5050
using rcl_interfaces::msg::ParameterType;
5151
using rcl_interfaces::msg::ParameterEvent;
5252

53-
string modelfile, loglevel;
54-
bool debug = false;
55-
unsigned int rate = 1000;
56-
bool verbose = false;
57-
5853
shared_ptr<system_modes::ModeMonitor> monitor;
5954

6055
void transition_callback(

system_modes/src/system_modes/mode_handling.cpp

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,19 @@
1414
// limitations under the License.
1515
#include "system_modes/mode_handling.hpp"
1616

17+
#include <shared_mutex>
18+
19+
#include <lifecycle_msgs/msg/state.hpp>
1720
#include <rclcpp/parameter.hpp>
1821
#include <rclcpp/parameter_map.hpp>
19-
#include <lifecycle_msgs/msg/state.hpp>
2022
#include <rcl_yaml_param_parser/parser.h>
2123

2224
#include <map>
25+
#include <memory>
2326
#include <mutex>
2427
#include <string>
25-
#include <vector>
26-
#include <memory>
2728
#include <utility>
28-
#include <shared_mutex>
29+
#include <vector>
2930

3031
using std::endl;
3132
using std::pair;

system_modes/src/system_modes/mode_impl.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@
1414
// limitations under the License.
1515
#include "system_modes/mode_impl.hpp"
1616

17+
#include <lifecycle_msgs/msg/state.hpp>
18+
#include <lifecycle_msgs/msg/transition.hpp>
19+
20+
#include <exception>
1721
#include <map>
1822
#include <string>
19-
#include <vector>
2023
#include <utility>
21-
#include <exception>
22-
23-
#include <lifecycle_msgs/msg/state.hpp>
24-
#include <lifecycle_msgs/msg/transition.hpp>
24+
#include <vector>
2525

2626
using std::map;
2727
using std::pair;

system_modes/src/system_modes/mode_inference.cpp

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,19 @@
1414
// limitations under the License.
1515
#include "system_modes/mode_inference.hpp"
1616

17+
#include <shared_mutex>
18+
19+
#include <lifecycle_msgs/msg/state.hpp>
1720
#include <rclcpp/parameter.hpp>
1821
#include <rclcpp/parameter_map.hpp>
19-
#include <lifecycle_msgs/msg/state.hpp>
2022
#include <rcl_yaml_param_parser/parser.h>
2123

2224
#include <map>
25+
#include <memory>
2326
#include <mutex>
2427
#include <string>
25-
#include <vector>
26-
#include <memory>
2728
#include <utility>
28-
#include <shared_mutex>
29+
#include <vector>
2930

3031
using std::endl;
3132
using std::mutex;

system_modes/src/system_modes/mode_monitor.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020
#include <lifecycle_msgs/srv/change_state.hpp>
2121
#include <lifecycle_msgs/srv/get_state.hpp>
2222

23-
#include <rcl_yaml_param_parser/parser.h>
2423
#include <rclcpp/parameter_map.hpp>
2524
#include <rcl_interfaces/srv/list_parameters.hpp>
25+
#include <rcl_yaml_param_parser/parser.h>
2626

2727
#include <string>
2828
#include <memory>

0 commit comments

Comments
 (0)