12345qiupeng
/
gtsam
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix warnings raised by GCC -Wpedactic

release/4.3a0
Jose Luis Blanco Claraco 2021-11-03 17:14:37 +01:00
parent b76e9ef52b
commit a61cbdc4d1
No known key found for this signature in database
GPG Key ID: D443304FBD70A641
14 changed files with 33 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gtsam/base/Manifold.h
View File

@ -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>

22
gtsam/base/Matrix.h
View File

@ -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);

2
gtsam/base/Testable.h
View File

@ -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>

4
gtsam/base/Vector.h
View File

@ -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);

4
gtsam/geometry/concepts.h
View File

@ -71,6 +71,6 @@ private:
*/
/** 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>;

2
gtsam/inference/FactorGraph.h
View File

@ -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_;

4
gtsam/navigation/MagPoseFactor.h
View File

@ -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 {}

2
gtsam/nonlinear/CustomFactor.h
View File

@ -101,4 +101,4 @@ private:
}
};
};
}

6
gtsam/nonlinear/NonlinearEquality.h
View File

@ -218,9 +218,9 @@ protected:
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() {}

2
gtsam/nonlinear/PriorFactor.h
View File

@ -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:

3
gtsam_unstable/slam/BetweenFactorEM.h
View File

@ -56,7 +56,8 @@ private:
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:

4
gtsam_unstable/slam/PoseBetweenFactor.h
View File

@ -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

4
gtsam_unstable/slam/PosePriorFactor.h
View File

@ -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

4
gtsam_unstable/slam/TransformBtwRobotsUnaryFactor.h
View File

@ -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: