Skip to content

Avoid hiding base class getRenderOperation in PointCloudRenderable #586

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ivanpauno merged 1 commit into from
Jul 27, 2020
Merged

Avoid hiding base class getRenderOperation in PointCloudRenderable #586

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 3 additions & 7 deletions rviz_rendering/include/rviz_rendering/objects/point_cloud_renderable.hpp
View file
Open in desktop
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