Fix linter false positives

Fix build errors from rebasing with main Signed-off-by: Matias N. Goldberg <[email protected]>
gazebosim · Dec 4, 2021 · 1a39e42 · 1a39e42
1 parent c200deb
commit 1a39e42
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/include/ignition/rendering/base/BaseRayQuery.hh b/include/ignition/rendering/base/BaseRayQuery.hh
@@ -143,7 +143,8 @@ namespace ignition
 
     //////////////////////////////////////////////////
     template <class T>
-    RayQueryResult BaseRayQuery<T>::ClosestPoint(bool /*_forceSceneUpdate*/)
+    RayQueryResult BaseRayQuery<T>::ClosestPoint(
+        bool /*_forceSceneUpdate*/)  // NOLINT
     {
       // TODO(anyone): implement a generic ray query here?
       RayQueryResult result;

diff --git a/ogre/src/OgreRayQuery.cc b/ogre/src/OgreRayQuery.cc
@@ -71,7 +71,7 @@ void OgreRayQuery::SetFromCamera(const CameraPtr &_camera,
 }
 
 //////////////////////////////////////////////////
-RayQueryResult OgreRayQuery::ClosestPoint(bool /*_forceSceneUpdate*/)
+RayQueryResult OgreRayQuery::ClosestPoint(bool /*_forceSceneUpdate*/) // NOLINT
 {
   RayQueryResult result;
   OgreScenePtr ogreScene = std::dynamic_pointer_cast<OgreScene>(this->Scene());

diff --git a/ogre2/include/ignition/rendering/ogre2/Ogre2RayQuery.hh b/ogre2/include/ignition/rendering/ogre2/Ogre2RayQuery.hh
@@ -58,7 +58,8 @@ namespace ignition
 
       /// \brief Get closest point by ray triangle intersection test.
       /// This is executed on the CPU.
-      private: RayQueryResult ClosestPointByIntersection();
+      private: RayQueryResult ClosestPointByIntersection(
+            bool _forceSceneUpdate);
 
       /// \brief Private data pointer
       private: std::unique_ptr<Ogre2RayQueryPrivate> dataPtr;

diff --git a/ogre2/src/Ogre2RayQuery.cc b/ogre2/src/Ogre2RayQuery.cc
@@ -117,7 +117,7 @@ RayQueryResult Ogre2RayQuery::ClosestPoint(bool _forceSceneUpdate)
   return this->ClosestPointByIntersection();
 
 #ifdef __APPLE__
-  return this->ClosestPointByIntersection();
+  return this->ClosestPointByIntersection(_forceSceneUpdate);
 #else
   if (!this->dataPtr->camera ||
       !this->dataPtr->camera->Parent() ||
@@ -126,7 +126,7 @@ RayQueryResult Ogre2RayQuery::ClosestPoint(bool _forceSceneUpdate)
     // use legacy method for backward compatibility if no camera is set or
     // camera is not attached in the scene tree or
     // this function is called from non-rendering thread
-    return this->ClosestPointByIntersection();
+    return this->ClosestPointByIntersection(_forceSceneUpdate);
   }
   else
   {
@@ -172,7 +172,7 @@ RayQueryResult Ogre2RayQuery::ClosestPointBySelectionBuffer()
 }
 
 //////////////////////////////////////////////////
-RayQueryResult Ogre2RayQuery::ClosestPointByIntersection()
+RayQueryResult Ogre2RayQuery::ClosestPointByIntersection(bool _forceSceneUpdate)
 {
   RayQueryResult result;
   Ogre2ScenePtr ogreScene =