Commit 26847ffd authored by Don Gagne's avatar Don Gagne

OpenSceneGraph has overridden virtuals defined in its headers

Use a pragma around our use of that header to silence the warning. OSG
3.01 has these warnings, 3.2 has fixed them, but 3.2 doesn’t isn’t the
widely used release yet. So at some point when we upgrade to 3.2 this
will no longer be needed.
parent dea781f2
......@@ -39,8 +39,20 @@ This file is part of the QGROUNDCONTROL project
#include <osg/PositionAttitudeTransform>
#include <osgGA/TrackballManipulator>
#include <osgText/Font>
// OpenSceneGraph has overloaded virtuals defined, since third party code we silence the warnings when the
// headers are used.
#ifndef Q_OS_WIN
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Woverloaded-virtual"
#endif
#include <osgViewer/Viewer>
#ifndef Q_OS_WIN
#pragma GCC diagnostic pop
#endif
#include "CameraParams.h"
#include "GCManipulator.h"
#include "SystemGroupNode.h"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment