Suppress 400 GCC warnings in Collada DOM headers
This commit is contained in:
@@ -30,7 +30,7 @@ include(BuildVersion)
|
||||
|
||||
include(UnixInstall)
|
||||
|
||||
set (DISABLE_FATAL_WARNINGS TRUE)
|
||||
set (DISABLE_FATAL_WARNINGS CACHE BOOL TRUE)
|
||||
|
||||
if (NOT CMAKE_CONFIGURATION_TYPES AND NOT CMAKE_BUILD_TYPE)
|
||||
set(CMAKE_BUILD_TYPE Release CACHE STRING
|
||||
|
||||
@@ -35,10 +35,13 @@
|
||||
#pragma warning (disable : 4263)
|
||||
#pragma warning (disable : 4264)
|
||||
#endif
|
||||
#pragma GCC diagnostic push
|
||||
#pragma GCC diagnostic ignored "-Woverloaded-virtual"
|
||||
#include "dae.h"
|
||||
#include "dae/daeErrorHandler.h"
|
||||
#include "dom/domConstants.h"
|
||||
#include "dom/domMesh.h"
|
||||
#pragma GCC diagnostic pop
|
||||
#if LL_MSVC
|
||||
#pragma warning (default : 4263)
|
||||
#pragma warning (default : 4264)
|
||||
|
||||
@@ -32,6 +32,8 @@
|
||||
|
||||
#include "llviewerprecompiledheaders.h"
|
||||
|
||||
#pragma GCC diagnostic push
|
||||
#pragma GCC diagnostic ignored "-Woverloaded-virtual"
|
||||
#include "dae.h"
|
||||
//#include "dom.h"
|
||||
#include "dom/domAsset.h"
|
||||
@@ -53,6 +55,7 @@
|
||||
#include "dom/domScale.h"
|
||||
#include "dom/domTranslate.h"
|
||||
#include "dom/domVisual_scene.h"
|
||||
#pragma GCC diagnostic pop
|
||||
|
||||
#include "llfloatermodelpreview.h"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user