Ignore spurious Wconversion warnings when using get_override

proyan · Apr 6, 2022 · 405fa82 · 405fa82
1 parent 03969b3
commit 405fa82
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 2 deletions.
diff --git a/python/broadphase/broadphase_callbacks.hh b/python/broadphase/broadphase_callbacks.hh
@@ -56,7 +56,10 @@ struct CollisionCallBackBaseWrapper : CollisionCallBackBase,
 
   void init() { this->get_override("init")(); }
   bool collide(CollisionObject* o1, CollisionObject* o2) {
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wconversion"
     return this->get_override("collide")(o1, o2);
+#pragma GCC diagnostic pop
   }
 
   static void expose() {
@@ -83,7 +86,10 @@ struct DistanceCallBackBaseWrapper : DistanceCallBackBase,
   }
 
   bool distance(CollisionObject* o1, CollisionObject* o2, FCL_REAL& dist) {
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wconversion"
     return this->get_override("distance")(o1, o2, dist);
+#pragma GCC diagnostic pop
   }
 
   static void expose() {

diff --git a/python/broadphase/broadphase_collision_manager.hh b/python/broadphase/broadphase_collision_manager.hh
@@ -78,7 +78,10 @@ struct BroadPhaseCollisionManagerWrapper
   void clear() { this->get_override("clear")(); }
 
   std::vector<CollisionObject *> getObjects() const {
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wconversion"
     return this->get_override("getObjects")();
+#pragma GCC diagnostic pop
   }
 
   void collide(CollisionCallBackBase *callback) const {
@@ -103,8 +106,18 @@ struct BroadPhaseCollisionManagerWrapper
     this->get_override("collide")(other_manager, callback);
   }
 
-  bool empty() const { return this->get_override("empty")(); }
-  size_t size() const { return this->get_override("size")(); }
+  bool empty() const {
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wconversion"
+    return this->get_override("empty")();
+#pragma GCC diagnostic pop
+  }
+  size_t size() const {
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wconversion"
+    return this->get_override("size")();
+#pragma GCC diagnostic pop
+  }
 
   static void expose() {
     bp::class_<BroadPhaseCollisionManagerWrapper, boost::noncopyable>(