Apply the fix for the compiler error.

Fix for the compiler error that occurs with the latest compilers (gcc 11 and up) when compiling sophus. Reference: stonier/sophus#23
YuZhong-Chen · Dec 1, 2023 · 7beb725 · 7beb725
1 parent 14846a8
commit 7beb725
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/kobuki_ws/src/sophus/sophus/common.hpp b/kobuki_ws/src/sophus/sophus/common.hpp
@@ -203,22 +203,22 @@ class optional {
   explicit operator bool() const { return is_valid_; }
 
   T const* operator->() const {
-    SOPHUS_ENSURE(is_valid_, "must be valid");
+    SOPHUS_ENSURE(is_valid_, "%s", "must be valid");
     return &type_;
   }
 
   T* operator->() {
-    SOPHUS_ENSURE(is_valid_, "must be valid");
+    SOPHUS_ENSURE(is_valid_, "%s", "must be valid");
     return &type_;
   }
 
   T const& operator*() const {
-    SOPHUS_ENSURE(is_valid_, "must be valid");
+    SOPHUS_ENSURE(is_valid_, "%s", "must be valid");
     return type_;
   }
 
   T& operator*() {
-    SOPHUS_ENSURE(is_valid_, "must be valid");
+    SOPHUS_ENSURE(is_valid_, "%s", "must be valid");
     return type_;
   }
 

diff --git a/kobuki_ws/src/sophus/sophus/se2.hpp b/kobuki_ws/src/sophus/sophus/se2.hpp
@@ -630,7 +630,7 @@ class SE2 : public SE2Base<SE2<Scalar_, Options>> {
   /// Precondition: ``i`` must be in 0, 1 or 2.
   ///
   SOPHUS_FUNC static Transformation generator(int i) {
-    SOPHUS_ENSURE(i >= 0 || i <= 2, "i should be in range [0,2].");
+    SOPHUS_ENSURE(i >= 0 || i <= 2, "%s", "i should be in range [0,2].");
     Tangent e;
     e.setZero();
     e[i] = Scalar(1);

diff --git a/kobuki_ws/src/sophus/sophus/se3.hpp b/kobuki_ws/src/sophus/sophus/se3.hpp
@@ -881,7 +881,7 @@ class SE3 : public SE3Base<SE3<Scalar_, Options>> {
   /// Precondition: ``i`` must be in [0, 5].
   ///
   SOPHUS_FUNC static Transformation generator(int i) {
-    SOPHUS_ENSURE(i >= 0 && i <= 5, "i should be in range [0,5].");
+    SOPHUS_ENSURE(i >= 0 && i <= 5, "%s", "i should be in range [0,5].");
     Tangent e;
     e.setZero();
     e[i] = Scalar(1);

diff --git a/kobuki_ws/src/sophus/sophus/so2.hpp b/kobuki_ws/src/sophus/sophus/so2.hpp
@@ -172,7 +172,7 @@ class SO2Base {
     using std::hypot;
     // Avoid under/overflows for higher precision
     Scalar length = hypot(unit_complex().x(), unit_complex().y());
-    SOPHUS_ENSURE(length >= Constants<Scalar>::epsilon(),
+    SOPHUS_ENSURE(length >= Constants<Scalar>::epsilon(), "%s",
                   "Complex number should not be close to zero!");
     unit_complex_nonconst() /= length;
   }

diff --git a/kobuki_ws/src/sophus/sophus/so3.hpp b/kobuki_ws/src/sophus/sophus/so3.hpp
@@ -668,7 +668,7 @@ class SO3 : public SO3Base<SO3<Scalar_, Options>> {
   ///
   SOPHUS_FUNC static SO3<Scalar> expAndTheta(Tangent const& omega,
                                              Scalar* theta) {
-    SOPHUS_ENSURE(theta != nullptr, "must not be nullptr.");
+    SOPHUS_ENSURE(theta != nullptr, "%s", "must not be nullptr.");
     using std::abs;
     using std::cos;
     using std::sin;
@@ -733,7 +733,7 @@ class SO3 : public SO3Base<SO3<Scalar_, Options>> {
   /// Precondition: ``i`` must be 0, 1 or 2.
   ///
   SOPHUS_FUNC static Transformation generator(int i) {
-    SOPHUS_ENSURE(i >= 0 && i <= 2, "i should be in range [0,2].");
+    SOPHUS_ENSURE(i >= 0 && i <= 2, "%s", "i should be in range [0,2].");
     Tangent e;
     e.setZero();
     e[i] = Scalar(1);