diff --git a/gtsam/base/VectorSpace.h b/gtsam/base/VectorSpace.h index f4e3d3020..a9e9ca106 100644 --- a/gtsam/base/VectorSpace.h +++ b/gtsam/base/VectorSpace.h @@ -185,7 +185,7 @@ template struct VectorSpaceTraits: VectorSpaceImpl { // Check that Class has the necessary machinery - GTSAM_CONCEPT_ASSERT(HasVectorSpacePrereqs); +GTSAM_CONCEPT_ASSERT(HasVectorSpacePrereqs); typedef vector_space_tag structure_category; diff --git a/gtsam/base/concepts.h b/gtsam/base/concepts.h index 5159d6f9b..f951329a7 100644 --- a/gtsam/base/concepts.h +++ b/gtsam/base/concepts.h @@ -19,7 +19,7 @@ // This does something sensible: #define BOOST_CONCEPT_USAGE(concept) void check##concept() // These just ignore the concept checking for now: -#define GTSAM_CONCEPT_ASSERT(concept) +#define GTSAM_CONCEPT_ASSERT(concept) void*(concept) #define GTSAM_CONCEPT_REQUIRES(concept, return_type) return_type #endif diff --git a/gtsam/nonlinear/Expression.h b/gtsam/nonlinear/Expression.h index 1e977ade1..e5017390d 100644 --- a/gtsam/nonlinear/Expression.h +++ b/gtsam/nonlinear/Expression.h @@ -218,7 +218,7 @@ protected: template class ScalarMultiplyExpression : public Expression { // Check that T is a vector space - GTSAM_CONCEPT_ASSERT(gtsam::IsVectorSpace); + GTSAM_CONCEPT_ASSERT(IsVectorSpace); public: explicit ScalarMultiplyExpression(double s, const Expression& e); @@ -231,7 +231,7 @@ class ScalarMultiplyExpression : public Expression { template class BinarySumExpression : public Expression { // Check that T is a vector space - GTSAM_CONCEPT_ASSERT(gtsam::IsVectorSpace); + GTSAM_CONCEPT_ASSERT(IsVectorSpace); public: explicit BinarySumExpression(const Expression& e1, const Expression& e2); diff --git a/gtsam/nonlinear/internal/ExpressionNode.h b/gtsam/nonlinear/internal/ExpressionNode.h index 1f45f7a87..de0c9721e 100644 --- a/gtsam/nonlinear/internal/ExpressionNode.h +++ b/gtsam/nonlinear/internal/ExpressionNode.h @@ -561,7 +561,7 @@ public: template class ScalarMultiplyNode : public ExpressionNode { // Check that T is a vector space - GTSAM_CONCEPT_ASSERT(gtsam::IsVectorSpace); + GTSAM_CONCEPT_ASSERT(IsVectorSpace); double scalar_; std::shared_ptr > expression_;