Skip to content

Commit d61e44d

Browse files
authored
Consistently add <cmath> include with define for windows (#3061) (#3065)
1 parent cf0f7ee commit d61e44d

3 files changed

Lines changed: 12 additions & 4 deletions

File tree

controller_manager/test/test_spawner_unspawner.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,10 @@
1414

1515
#include <gtest/gtest.h>
1616

17+
#ifndef _USE_MATH_DEFINES
18+
#define _USE_MATH_DEFINES
19+
#endif
20+
#include <cmath>
1721
#include <cstdlib>
1822
#include <memory>
1923
#include <string>

hardware_interface/test/test_component_parser.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,17 @@
1313
// limitations under the License.
1414

1515
#include <gmock/gmock.h>
16+
#ifndef _USE_MATH_DEFINES
17+
#define _USE_MATH_DEFINES
18+
#endif
19+
#include <cmath>
1620
#include <string>
1721

1822
#include "hardware_interface/component_parser.hpp"
1923
#include "hardware_interface/types/hardware_interface_type_values.hpp"
2024
#include "ros2_control_test_assets/components_urdfs.hpp"
2125
#include "ros2_control_test_assets/descriptions.hpp"
2226

23-
#ifdef _WIN32
24-
#define M_PI 3.1415926535897932384626433832795
25-
#endif
26-
2727
using namespace ::testing; // NOLINT
2828

2929
class TestComponentParser : public Test

hardware_interface_testing/test/test_resource_manager.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,13 @@
1414

1515
// Authors: Karsten Knese, Denis Stogl
1616

17+
#ifndef _USE_MATH_DEFINES
18+
#define _USE_MATH_DEFINES
19+
#endif
1720
#include "test_resource_manager.hpp"
1821

1922
#include <algorithm>
23+
#include <cmath>
2024
#include <memory>
2125
#include <string>
2226
#include <unordered_map>

0 commit comments

Comments
 (0)