Merge branch 'main' into scpeters/rm_deprecated_8

gazebosim · Jul 2, 2024 · 01c3dc8 · 01c3dc8
2 parents 337df73 + 15bfa5e
commit 01c3dc8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 20 deletions.
diff --git a/include/gz/math/Stopwatch.hh b/include/gz/math/Stopwatch.hh
@@ -30,7 +30,9 @@ namespace gz
     // Use a steady clock
     // This alias is now deprecated; please use std::chrono::steady_clock
     // directly instead.
-    using clock GZ_DEPRECATED(8) = std::chrono::steady_clock;
+    using clock
+        [[deprecated("As of 8.0, use std::chrono::steady_clock directly.")]]
+        = std::chrono::steady_clock;
 
     // Inline bracket to help doxygen filtering.
     inline namespace GZ_MATH_VERSION_NAMESPACE {

diff --git a/include/ignition/math/MecanumDriveOdometry.hh b/include/ignition/math/MecanumDriveOdometry.hh