Fix warnings raised by GCC -Wpedactic

borglab · Nov 3, 2021 · a61cbdc · a61cbdc
1 parent b76e9ef
commit a61cbdc
Show file tree

Hide file tree

Showing 14 changed files with 33 additions and 32 deletions.
diff --git a/gtsam/base/Manifold.h b/gtsam/base/Manifold.h
@@ -178,4 +178,4 @@ struct FixedDimension {
 // * the gtsam namespace to be more easily enforced as testable
 // */
 #define GTSAM_CONCEPT_MANIFOLD_INST(T) template class gtsam::IsManifold<T>;
-#define GTSAM_CONCEPT_MANIFOLD_TYPE(T) typedef gtsam::IsManifold<T> _gtsam_IsManifold_##T;
+#define GTSAM_CONCEPT_MANIFOLD_TYPE(T) using _gtsam_IsManifold_##T = gtsam::IsManifold<T>
diff --git a/gtsam/base/Matrix.h b/gtsam/base/Matrix.h
@@ -46,18 +46,18 @@ typedef Eigen::Matrix<double, Eigen::Dynamic, Eigen::Dynamic, Eigen::RowMajor> M
 // Create handy typedefs and constants for square-size matrices
 // MatrixMN, MatrixN = MatrixNN, I_NxN, and Z_NxN, for M,N=1..9
 #define GTSAM_MAKE_MATRIX_DEFS(N)   \
-typedef Eigen::Matrix<double, N, N> Matrix##N;  \
-typedef Eigen::Matrix<double, 1, N> Matrix1##N;  \
-typedef Eigen::Matrix<double, 2, N> Matrix2##N;  \
-typedef Eigen::Matrix<double, 3, N> Matrix3##N;  \
-typedef Eigen::Matrix<double, 4, N> Matrix4##N;  \
-typedef Eigen::Matrix<double, 5, N> Matrix5##N;  \
-typedef Eigen::Matrix<double, 6, N> Matrix6##N;  \
-typedef Eigen::Matrix<double, 7, N> Matrix7##N;  \
-typedef Eigen::Matrix<double, 8, N> Matrix8##N;  \
-typedef Eigen::Matrix<double, 9, N> Matrix9##N;  \
+using Matrix##N = Eigen::Matrix<double, N, N>;  \
+using Matrix1##N = Eigen::Matrix<double, 1, N>;  \
+using Matrix2##N = Eigen::Matrix<double, 2, N>;  \
+using Matrix3##N = Eigen::Matrix<double, 3, N>;  \
+using Matrix4##N = Eigen::Matrix<double, 4, N>;  \
+using Matrix5##N = Eigen::Matrix<double, 5, N>;  \
+using Matrix6##N = Eigen::Matrix<double, 6, N>;  \
+using Matrix7##N = Eigen::Matrix<double, 7, N>;  \
+using Matrix8##N = Eigen::Matrix<double, 8, N>;  \
+using Matrix9##N = Eigen::Matrix<double, 9, N>;  \
 static const Eigen::MatrixBase<Matrix##N>::IdentityReturnType I_##N##x##N = Matrix##N::Identity(); \
-static const Eigen::MatrixBase<Matrix##N>::ConstantReturnType Z_##N##x##N = Matrix##N::Zero();
+static const Eigen::MatrixBase<Matrix##N>::ConstantReturnType Z_##N##x##N = Matrix##N::Zero()
 
 GTSAM_MAKE_MATRIX_DEFS(1);
 GTSAM_MAKE_MATRIX_DEFS(2);

diff --git a/gtsam/base/Testable.h b/gtsam/base/Testable.h
@@ -173,4 +173,4 @@ namespace gtsam {
  * @deprecated please use BOOST_CONCEPT_ASSERT and
  */
 #define GTSAM_CONCEPT_TESTABLE_INST(T) template class gtsam::IsTestable<T>;
-#define GTSAM_CONCEPT_TESTABLE_TYPE(T) typedef gtsam::IsTestable<T> _gtsam_Testable_##T;
+#define GTSAM_CONCEPT_TESTABLE_TYPE(T) using _gtsam_Testable_##T = gtsam::IsTestable<T>
diff --git a/gtsam/base/Vector.h b/gtsam/base/Vector.h
@@ -48,8 +48,8 @@ static const Eigen::MatrixBase<Vector3>::ConstantReturnType Z_3x1 = Vector3::Zer
 // Create handy typedefs and constants for vectors with N>3
 // VectorN and Z_Nx1, for N=1..9
 #define GTSAM_MAKE_VECTOR_DEFS(N)                \
-  typedef Eigen::Matrix<double, N, 1> Vector##N; \
-  static const Eigen::MatrixBase<Vector##N>::ConstantReturnType Z_##N##x1 = Vector##N::Zero();
+  using Vector##N = Eigen::Matrix<double, N, 1>; \
+  static const Eigen::MatrixBase<Vector##N>::ConstantReturnType Z_##N##x1 = Vector##N::Zero()
 
 GTSAM_MAKE_VECTOR_DEFS(4);
 GTSAM_MAKE_VECTOR_DEFS(5);

diff --git a/gtsam/geometry/concepts.h b/gtsam/geometry/concepts.h
@@ -71,6 +71,6 @@ class PoseConcept {
  */
 
 /** Pose Concept macros */
-#define GTSAM_CONCEPT_POSE_INST(T) template class gtsam::PoseConcept<T>;
-#define GTSAM_CONCEPT_POSE_TYPE(T) typedef gtsam::PoseConcept<T> _gtsam_PoseConcept##T;
+#define GTSAM_CONCEPT_POSE_INST(T) template class gtsam::PoseConcept<T>
+#define GTSAM_CONCEPT_POSE_TYPE(T) using _gtsam_PoseConcept##T = gtsam::PoseConcept<T>;
 
diff --git a/gtsam/inference/FactorGraph.h b/gtsam/inference/FactorGraph.h
@@ -121,7 +121,7 @@ class FactorGraph {
 
  protected:
   /** concept check, makes sure FACTOR defines print and equals */
-  GTSAM_CONCEPT_TESTABLE_TYPE(FACTOR)
+  GTSAM_CONCEPT_TESTABLE_TYPE(FACTOR);
 
   /** Collection of factors */
   FastVector<sharedFactor> factors_;

diff --git a/gtsam/navigation/MagPoseFactor.h b/gtsam/navigation/MagPoseFactor.h
@@ -45,8 +45,8 @@ class MagPoseFactor: public NoiseModelFactor1<POSE> {
   using shared_ptr = boost::shared_ptr<MagPoseFactor<POSE>>;
 
   /// Concept check by type.
-  GTSAM_CONCEPT_TESTABLE_TYPE(POSE)
-  GTSAM_CONCEPT_POSE_TYPE(POSE)
+  GTSAM_CONCEPT_TESTABLE_TYPE(POSE);
+  GTSAM_CONCEPT_POSE_TYPE(POSE);
 
  public:
   ~MagPoseFactor() override {}

diff --git a/gtsam/nonlinear/CustomFactor.h b/gtsam/nonlinear/CustomFactor.h
@@ -101,4 +101,4 @@ class CustomFactor: public NoiseModelFactor {
   }
 };
 
-};
+}
diff --git a/gtsam/nonlinear/NonlinearEquality.h b/gtsam/nonlinear/NonlinearEquality.h
@@ -218,9 +218,9 @@ class NonlinearEquality1: public NoiseModelFactor1<VALUE> {
 
   X value_; /// fixed value for variable
 
-  GTSAM_CONCEPT_MANIFOLD_TYPE(X)
+  GTSAM_CONCEPT_MANIFOLD_TYPE(X);
 
-  GTSAM_CONCEPT_TESTABLE_TYPE(X)
+  GTSAM_CONCEPT_TESTABLE_TYPE(X);
 
 public:
 
@@ -296,7 +296,7 @@ class NonlinearEquality2 : public NoiseModelFactor2<T, T> {
   using Base = NoiseModelFactor2<T, T>;
   using This = NonlinearEquality2<T>;
 
-  GTSAM_CONCEPT_MANIFOLD_TYPE(T)
+  GTSAM_CONCEPT_MANIFOLD_TYPE(T);
 
   /// Default constructor to allow for serialization
   NonlinearEquality2() {}

diff --git a/gtsam/nonlinear/PriorFactor.h b/gtsam/nonlinear/PriorFactor.h
@@ -39,7 +39,7 @@ namespace gtsam {
     VALUE prior_; /** The measurement */
 
     /** concept check by type */
-    GTSAM_CONCEPT_TESTABLE_TYPE(T)
+    GTSAM_CONCEPT_TESTABLE_TYPE(T);
 
   public:
 

diff --git a/gtsam_unstable/slam/BetweenFactorEM.h b/gtsam_unstable/slam/BetweenFactorEM.h
@@ -56,7 +56,8 @@ class BetweenFactorEM: public NonlinearFactor {
   bool flag_bump_up_near_zero_probs_;
 
   /** concept check by type */
-  GTSAM_CONCEPT_LIE_TYPE(T)GTSAM_CONCEPT_TESTABLE_TYPE(T)
+  GTSAM_CONCEPT_LIE_TYPE(T);
+  GTSAM_CONCEPT_TESTABLE_TYPE(T);
 
 public:
 

diff --git a/gtsam_unstable/slam/PoseBetweenFactor.h b/gtsam_unstable/slam/PoseBetweenFactor.h
@@ -40,8 +40,8 @@ namespace gtsam {
     boost::optional<POSE> body_P_sensor_; ///< The pose of the sensor in the body frame
 
     /** concept check by type */
-    GTSAM_CONCEPT_TESTABLE_TYPE(POSE)
-    GTSAM_CONCEPT_POSE_TYPE(POSE)
+    GTSAM_CONCEPT_TESTABLE_TYPE(POSE);
+    GTSAM_CONCEPT_POSE_TYPE(POSE);
   public:
 
     // shorthand for a smart pointer to a factor

diff --git a/gtsam_unstable/slam/PosePriorFactor.h b/gtsam_unstable/slam/PosePriorFactor.h
@@ -37,8 +37,8 @@ namespace gtsam {
     boost::optional<POSE> body_P_sensor_; ///< The pose of the sensor in the body frame
 
     /** concept check by type */
-    GTSAM_CONCEPT_TESTABLE_TYPE(POSE)
-    GTSAM_CONCEPT_POSE_TYPE(POSE)
+    GTSAM_CONCEPT_TESTABLE_TYPE(POSE);
+    GTSAM_CONCEPT_POSE_TYPE(POSE);
   public:
 
     /// shorthand for a smart pointer to a factor

diff --git a/gtsam_unstable/slam/TransformBtwRobotsUnaryFactor.h b/gtsam_unstable/slam/TransformBtwRobotsUnaryFactor.h
@@ -55,8 +55,8 @@ namespace gtsam {
     SharedGaussian model_;
 
     /** concept check by type */
-    GTSAM_CONCEPT_LIE_TYPE(T)
-    GTSAM_CONCEPT_TESTABLE_TYPE(T)
+    GTSAM_CONCEPT_LIE_TYPE(T);
+    GTSAM_CONCEPT_TESTABLE_TYPE(T);
 
   public:
-Original file line number
+Diff line change
@@ Expand Up / @@ -101,4 +101,4 @@ class CustomFactor: public NoiseModelFactor { @@
       }
     };
-    };
+    }