Merge pull request #1865 from scoutdi/warnings

Fix / suppress some build warnings
mavlink · Jun 12, 2023 · 4a8cd45 · 4a8cd45
2 parents 5c5663d + 497eb5b
commit 4a8cd45
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 9 deletions.
diff --git a/libmavconn/CMakeLists.txt b/libmavconn/CMakeLists.txt
@@ -35,6 +35,7 @@ catkin_package(
 
 include_directories(
   include
+  SYSTEM
   ${CMAKE_CURRENT_BINARY_DIR}/catkin_generated/include
   ${Boost_INCLUDE_DIRS}
   ${mavlink_INCLUDE_DIRS}

diff --git a/mavros/CMakeLists.txt b/mavros/CMakeLists.txt
@@ -87,6 +87,7 @@ catkin_package(
 
 include_directories(
   include
+  SYSTEM
   ${catkin_INCLUDE_DIRS}
   ${Boost_INCLUDE_DIRS}
   ${mavlink_INCLUDE_DIRS}

diff --git a/mavros/include/mavros/mavlink_diag.h b/mavros/include/mavros/mavlink_diag.h
@@ -40,5 +40,5 @@ class MavlinkDiag : public diagnostic_updater::DiagnosticTask
 	unsigned int last_drop_count;
 	std::atomic<bool> is_connected;
 };
-};	// namespace mavros
+}	// namespace mavros
 
diff --git a/mavros/src/lib/mavlink_diag.cpp b/mavros/src/lib/mavlink_diag.cpp
@@ -19,7 +19,7 @@ MavlinkDiag::MavlinkDiag(std::string name) :
 	diagnostic_updater::DiagnosticTask(name),
 	last_drop_count(0),
 	is_connected(false)
-{ };
+{ }
 
 void MavlinkDiag::run(diagnostic_updater::DiagnosticStatusWrapper &stat)
 {

diff --git a/mavros_extras/CMakeLists.txt b/mavros_extras/CMakeLists.txt
@@ -60,6 +60,7 @@ catkin_package(
 ###########
 
 include_directories(
+  SYSTEM
   ${catkin_INCLUDE_DIRS}
   ${mavlink_INCLUDE_DIRS}
 )

diff --git a/mavros_extras/src/plugins/landing_target.cpp b/mavros_extras/src/plugins/landing_target.cpp
@@ -40,18 +40,18 @@ class LandingTargetPlugin : public plugin::PluginBase,
 public:
 	LandingTargetPlugin() :
 		nh("~landing_target"),
-		tf_rate(10.0),
 		send_tf(true),
 		listen_tf(false),
+		tf_rate(10.0),
 		listen_lt(false),
-		mav_frame("LOCAL_NED"),
 		target_size_x(1.0),
 		target_size_y(1.0),
-		image_width(640),
-		image_height(480),
 		fov_x(2.0071286398),
 		fov_y(2.0071286398),
 		focal_length(2.8),
+		image_width(640),
+		image_height(480),
+		mav_frame("LOCAL_NED"),
 		land_target_type("VISION_FIDUCIAL")
 	{ }
 

diff --git a/mavros_extras/src/plugins/mount_control.cpp b/mavros_extras/src/plugins/mount_control.cpp
@@ -166,8 +166,8 @@ class MountControlPlugin : public plugin::PluginBase {
 public:
 	MountControlPlugin() : PluginBase(),
 		nh("~"),
-		mount_diag("Mount"),
-		mount_nh("~mount_control")
+		mount_nh("~mount_control"),
+		mount_diag("Mount")
 	{ }
 
 	void initialize(UAS &uas_) override

diff --git a/mavros_extras/src/plugins/wheel_odometry.cpp b/mavros_extras/src/plugins/wheel_odometry.cpp
@@ -38,8 +38,8 @@ class WheelOdometryPlugin : public plugin::PluginBase {
 
 	WheelOdometryPlugin() : PluginBase(),
 		wo_nh("~wheel_odometry"),
-		count(0),
 		odom_mode(OM::NONE),
+		count(0),
 		raw_send(false),
 		twist_send(false),
 		tf_send(false),

diff --git a/test_mavros/CMakeLists.txt b/test_mavros/CMakeLists.txt
@@ -66,6 +66,7 @@ catkin_package(
 
 include_directories(
   include
+  SYSTEM
   ${Boost_INCLUDE_DIRS}
   ${EIGEN3_INCLUDE_DIRS}
   ${catkin_INCLUDE_DIRS}