From 26847ffd1e14cde8581ab542a4f6f37534a3740e Mon Sep 17 00:00:00 2001 From: Don Gagne Date: Thu, 13 Feb 2014 09:59:06 -0800 Subject: [PATCH] OpenSceneGraph has overridden virtuals defined in its headers MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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. --- src/ui/map3D/Q3DWidget.h | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/ui/map3D/Q3DWidget.h b/src/ui/map3D/Q3DWidget.h index 32b9dc464..037de8aa9 100644 --- a/src/ui/map3D/Q3DWidget.h +++ b/src/ui/map3D/Q3DWidget.h @@ -39,8 +39,20 @@ This file is part of the QGROUNDCONTROL project #include #include #include + +// 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 +#ifndef Q_OS_WIN +#pragma GCC diagnostic pop +#endif + #include "CameraParams.h" #include "GCManipulator.h" #include "SystemGroupNode.h" -- 2.22.0