Reverted ill-advised quick fix for concepts - now no-op.

jlblancoc · Feb 11, 2023 · 1795757 · 1795757
1 parent 81ce4f4
commit 1795757
Showing 1 changed file with 3 additions and 12 deletions.
diff --git a/gtsam/base/concepts.h b/gtsam/base/concepts.h
@@ -14,21 +14,12 @@
 #include <boost/concept/requires.hpp>
 #include <boost/concept_check.hpp>
 #define GTSAM_CONCEPT_ASSERT(concept) BOOST_CONCEPT_ASSERT((concept))
-#define GTSAM_CONCEPT_ASSERT1(concept) BOOST_CONCEPT_ASSERT((concept))
-#define GTSAM_CONCEPT_ASSERT2(concept) BOOST_CONCEPT_ASSERT((concept))
-#define GTSAM_CONCEPT_ASSERT3(concept) BOOST_CONCEPT_ASSERT((concept))
-#define GTSAM_CONCEPT_ASSERT4(concept) BOOST_CONCEPT_ASSERT((concept))
 #define GTSAM_CONCEPT_REQUIRES(concept, return_type) BOOST_CONCEPT_REQUIRES(((concept)), (return_type))
 #else 
-// These do something sensible:
+// This does something sensible:
 #define BOOST_CONCEPT_USAGE(concept) void check##concept()
-// TODO(dellaert): would be nice if it was a single macro...
-#define GTSAM_CONCEPT_ASSERT(concept) concept checkConcept [[maybe_unused]]
-#define GTSAM_CONCEPT_ASSERT1(concept) concept checkConcept1 [[maybe_unused]]
-#define GTSAM_CONCEPT_ASSERT2(concept) concept checkConcept2 [[maybe_unused]]
-#define GTSAM_CONCEPT_ASSERT3(concept) concept checkConcept3 [[maybe_unused]]
-#define GTSAM_CONCEPT_ASSERT4(concept) concept checkConcept4 [[maybe_unused]]
-// This one just ignores concept for now:
+// These just ignore the concept checking for now:
+#define GTSAM_CONCEPT_ASSERT(concept)
 #define GTSAM_CONCEPT_REQUIRES(concept, return_type) return_type
 #endif