Skip to content

Commit

Permalink
Avoid hidding base class getRenderOperation in PointCloudRenderable (#…
Browse files Browse the repository at this point in the history
…586)

Signed-off-by: Ivan Santiago Paunovic <ivanpauno@ekumenlabs.com>
  • Loading branch information
ivanpauno authored Jul 27, 2020
1 parent 4532ef6 commit 78a59cf
Showing 1 changed file with 3 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -73,15 +73,11 @@ class PointCloudRenderable : public Ogre::SimpleRenderable
RVIZ_RENDERING_PUBLIC
virtual ~PointCloudRenderable();

#ifndef _WIN32
# pragma GCC diagnostic push
# pragma GCC diagnostic ignored "-Woverloaded-virtual"
#endif
RVIZ_RENDERING_PUBLIC
Ogre::RenderOperation * getRenderOperation() {return &mRenderOp;}
#ifndef _WIN32
# pragma GCC diagnostic pop
#endif

// Avoid hidding parent class overload.
using Ogre::SimpleRenderable::getRenderOperation;

RVIZ_RENDERING_PUBLIC
Ogre::HardwareVertexBufferSharedPtr getBuffer();
Expand Down

0 comments on commit 78a59cf

Please sign in to comment.