Skip to content

Commit a20da7b

Browse files
authored
Removed deprecations (#1556)
Signed-off-by: Alejandro Hernandez Cordero <[email protected]>
1 parent ea783cb commit a20da7b

File tree

3 files changed

+39
-0
lines changed

3 files changed

+39
-0
lines changed

rviz_common/src/rviz_common/display.cpp

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,20 @@ void Display::setTopic(const QString & topic, const QString & datatype)
185185

186186
void Display::update(std::chrono::nanoseconds wall_dt, std::chrono::nanoseconds ros_dt)
187187
{
188+
#if !defined(_WIN32)
189+
# pragma GCC diagnostic push
190+
# pragma GCC diagnostic ignored "-Wdeprecated-declarations"
191+
#else // !defined(_WIN32)
192+
# pragma warning(push)
193+
# pragma warning(disable: 4996)
194+
#endif
188195
update(wall_dt.count(), ros_dt.count());
196+
// remove warning suppression
197+
#if !defined(_WIN32)
198+
# pragma GCC diagnostic pop
199+
#else // !defined(_WIN32)
200+
# pragma warning(pop)
201+
#endif
189202
}
190203

191204
void Display::update(float wall_dt, float ros_dt)

rviz_common/src/rviz_common/tool.cpp

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,20 @@ bool Tool::accessAllKeys() const
8181

8282
void Tool::update(std::chrono::nanoseconds wall_dt, std::chrono::nanoseconds ros_dt)
8383
{
84+
#if !defined(_WIN32)
85+
# pragma GCC diagnostic push
86+
# pragma GCC diagnostic ignored "-Wdeprecated-declarations"
87+
#else // !defined(_WIN32)
88+
# pragma warning(push)
89+
# pragma warning(disable: 4996)
90+
#endif
8491
update(wall_dt.count(), ros_dt.count());
92+
// remove warning suppression
93+
#if !defined(_WIN32)
94+
# pragma GCC diagnostic pop
95+
#else // !defined(_WIN32)
96+
# pragma warning(pop)
97+
#endif
8598
}
8699

87100
void Tool::update(float wall_dt, float ros_dt)

rviz_common/src/rviz_common/view_controller.cpp

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,20 @@ void ViewController::activate()
194194

195195
void ViewController::update(std::chrono::nanoseconds dt, std::chrono::nanoseconds ros_dt)
196196
{
197+
#if !defined(_WIN32)
198+
# pragma GCC diagnostic push
199+
# pragma GCC diagnostic ignored "-Wdeprecated-declarations"
200+
#else // !defined(_WIN32)
201+
# pragma warning(push)
202+
# pragma warning(disable: 4996)
203+
#endif
197204
update(dt.count(), ros_dt.count());
205+
// remove warning suppression
206+
#if !defined(_WIN32)
207+
# pragma GCC diagnostic pop
208+
#else // !defined(_WIN32)
209+
# pragma warning(pop)
210+
#endif
198211
}
199212

200213
void ViewController::update(float dt, float ros_dt)

0 commit comments

Comments
 (0)