Skip to content

Commit a7af60b

Browse files
authored
Add -Werror=missing-braces to compile options (ros-controls#1423)
1 parent 81b67a1 commit a7af60b

File tree

12 files changed

+35
-29
lines changed

12 files changed

+35
-29
lines changed

controller_interface/CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ cmake_minimum_required(VERSION 3.16)
22
project(controller_interface LANGUAGES CXX)
33

44
if(CMAKE_CXX_COMPILER_ID MATCHES "(GNU|Clang)")
5-
add_compile_options(-Wall -Wextra -Werror=conversion -Werror=unused-but-set-variable -Werror=return-type -Werror=shadow)
5+
add_compile_options(-Wall -Wextra -Werror=conversion -Werror=unused-but-set-variable -Werror=return-type -Werror=shadow
6+
-Werror=missing-braces)
67
endif()
78

89
set(THIS_PACKAGE_INCLUDE_DEPENDS

controller_interface/test/test_force_torque_sensor.hpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,13 +68,13 @@ class ForceTorqueSensorTest : public ::testing::Test
6868
protected:
6969
const size_t size_ = 6;
7070
const std::string sensor_name_ = "test_FTS";
71-
std::array<double, 3> force_values_ = {1.1, 2.2, 3.3};
72-
std::array<double, 3> torque_values_ = {4.4, 5.5, 6.6};
71+
std::array<double, 3> force_values_ = {{1.1, 2.2, 3.3}};
72+
std::array<double, 3> torque_values_ = {{4.4, 5.5, 6.6}};
7373
std::unique_ptr<TestableForceTorqueSensor> force_torque_sensor_;
7474

7575
std::vector<std::string> full_interface_names_;
76-
const std::vector<std::string> fts_interface_names_ = {"force.x", "force.y", "force.z",
77-
"torque.x", "torque.y", "torque.z"};
76+
const std::vector<std::string> fts_interface_names_ = {
77+
{"force.x", "force.y", "force.z", "torque.x", "torque.y", "torque.z"}};
7878
};
7979

8080
#endif // TEST_FORCE_TORQUE_SENSOR_HPP_

controller_interface/test/test_imu_sensor.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,9 @@ class IMUSensorTest : public ::testing::Test
5656
protected:
5757
const size_t size_ = 10;
5858
const std::string sensor_name_ = "test_IMU";
59-
std::array<double, 4> orientation_values_ = {1.1, 2.2, 3.3, 4.4};
60-
std::array<double, 3> angular_velocity_values_ = {4.4, 5.5, 6.6};
61-
std::array<double, 3> linear_acceleration_values_ = {4.4, 5.5, 6.6};
59+
std::array<double, 4> orientation_values_ = {{1.1, 2.2, 3.3, 4.4}};
60+
std::array<double, 3> angular_velocity_values_ = {{4.4, 5.5, 6.6}};
61+
std::array<double, 3> linear_acceleration_values_ = {{4.4, 5.5, 6.6}};
6262
std::unique_ptr<TestableIMUSensor> imu_sensor_;
6363

6464
std::vector<std::string> full_interface_names_;

controller_manager/CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ cmake_minimum_required(VERSION 3.16)
22
project(controller_manager LANGUAGES CXX)
33

44
if(CMAKE_CXX_COMPILER_ID MATCHES "(GNU|Clang)")
5-
add_compile_options(-Wall -Wextra -Werror=conversion -Werror=unused-but-set-variable -Werror=return-type -Werror=shadow)
5+
add_compile_options(-Wall -Wextra -Werror=conversion -Werror=unused-but-set-variable -Werror=return-type -Werror=shadow
6+
-Werror=missing-braces)
67
endif()
78

89
set(THIS_PACKAGE_INCLUDE_DEPENDS

hardware_interface/CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ cmake_minimum_required(VERSION 3.16)
22
project(hardware_interface LANGUAGES CXX)
33

44
if(CMAKE_CXX_COMPILER_ID MATCHES "(GNU|Clang)")
5-
add_compile_options(-Wall -Wextra -Werror=conversion -Werror=unused-but-set-variable -Werror=return-type -Werror=shadow)
5+
add_compile_options(-Wall -Wextra -Werror=conversion -Werror=unused-but-set-variable -Werror=return-type -Werror=shadow
6+
-Werror=missing-braces)
67
endif()
78

89
set(THIS_PACKAGE_INCLUDE_DEPENDS

hardware_interface/test/test_component_interfaces.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -341,12 +341,12 @@ class DummySystem : public hardware_interface::SystemInterface
341341

342342
private:
343343
std::array<double, 3> position_state_ = {
344-
std::numeric_limits<double>::quiet_NaN(), std::numeric_limits<double>::quiet_NaN(),
345-
std::numeric_limits<double>::quiet_NaN()};
344+
{std::numeric_limits<double>::quiet_NaN(), std::numeric_limits<double>::quiet_NaN(),
345+
std::numeric_limits<double>::quiet_NaN()}};
346346
std::array<double, 3> velocity_state_ = {
347-
std::numeric_limits<double>::quiet_NaN(), std::numeric_limits<double>::quiet_NaN(),
348-
std::numeric_limits<double>::quiet_NaN()};
349-
std::array<double, 3> velocity_command_ = {0.0, 0.0, 0.0};
347+
{std::numeric_limits<double>::quiet_NaN(), std::numeric_limits<double>::quiet_NaN(),
348+
std::numeric_limits<double>::quiet_NaN()}};
349+
std::array<double, 3> velocity_command_ = {{0.0, 0.0, 0.0}};
350350

351351
// Helper variables to initiate error on read
352352
unsigned int read_calls_ = 0;

hardware_interface/test/test_hardware_components/test_system_with_command_modes.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -184,11 +184,11 @@ class TestSystemCommandModes : public hardware_interface::SystemInterface
184184
std::vector<std::string> start_modes_ = {"position", "position"};
185185
std::vector<bool> stop_modes_ = {false, false};
186186

187-
std::array<double, 2> position_command_ = {0.0, 0.0};
188-
std::array<double, 2> velocity_command_ = {0.0, 0.0};
189-
std::array<double, 2> position_state_ = {0.0, 0.0};
190-
std::array<double, 2> velocity_state_ = {0.0, 0.0};
191-
std::array<double, 2> acceleration_state_ = {0.0, 0.0};
187+
std::array<double, 2> position_command_ = {{0.0, 0.0}};
188+
std::array<double, 2> velocity_command_ = {{0.0, 0.0}};
189+
std::array<double, 2> position_state_ = {{0.0, 0.0}};
190+
std::array<double, 2> velocity_state_ = {{0.0, 0.0}};
191+
std::array<double, 2> acceleration_state_ = {{0.0, 0.0}};
192192
};
193193

194194
} // namespace test_hardware_components

hardware_interface/test/test_hardware_components/test_two_joint_system.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,8 @@ class TestTwoJointSystem : public SystemInterface
103103
}
104104

105105
private:
106-
std::array<double, 2> position_command_ = {0.0, 0.0};
107-
std::array<double, 2> position_state_ = {0.0, 0.0};
106+
std::array<double, 2> position_command_ = {{0.0, 0.0}};
107+
std::array<double, 2> position_state_ = {{0.0, 0.0}};
108108
};
109109

110110
} // namespace test_hardware_components

hardware_interface_testing/CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ cmake_minimum_required(VERSION 3.16)
22
project(hardware_interface_testing LANGUAGES CXX)
33

44
if(CMAKE_CXX_COMPILER_ID MATCHES "(GNU|Clang)")
5-
add_compile_options(-Wall -Wextra -Werror=conversion -Werror=unused-but-set-variable -Werror=return-type -Werror=shadow)
5+
add_compile_options(-Wall -Wextra -Werror=conversion -Werror=unused-but-set-variable -Werror=return-type -Werror=shadow
6+
-Werror=missing-braces)
67
endif()
78

89
set(THIS_PACKAGE_INCLUDE_DEPENDS

hardware_interface_testing/test/test_components/test_system.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -114,10 +114,10 @@ class TestSystem : public SystemInterface
114114
}
115115

116116
private:
117-
std::array<double, 2> velocity_command_ = {0.0, 0.0};
118-
std::array<double, 2> position_state_ = {0.0, 0.0};
119-
std::array<double, 2> velocity_state_ = {0.0, 0.0};
120-
std::array<double, 2> acceleration_state_ = {0.0, 0.0};
117+
std::array<double, 2> velocity_command_ = {{0.0, 0.0}};
118+
std::array<double, 2> position_state_ = {{0.0, 0.0}};
119+
std::array<double, 2> velocity_state_ = {{0.0, 0.0}};
120+
std::array<double, 2> acceleration_state_ = {{0.0, 0.0}};
121121
double max_acceleration_command_ = 0.0;
122122
double configuration_state_ = 0.0;
123123
double configuration_command_ = 0.0;

0 commit comments

Comments
 (0)