Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix windows build: warnings management

Browse Source
This commit is contained in:
Latif Khalifa
2013-01-30 05:45:00 +01:00
parent 4d805da6ac
commit 5c8e436401
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
indra/llprimitive/llmodel.cpp
View File

@@ -32,6 +32,8 @@
#include "llsdserialize.h" #include "llsdserialize.h"
#include "llvector4a.h" #include "llvector4a.h"
#if LL_MSVC #if LL_MSVC
#pragma warning (push)
#pragma warning (disable : 4068)
#pragma warning (disable : 4263) #pragma warning (disable : 4263)
#pragma warning (disable : 4264) #pragma warning (disable : 4264)
#endif #endif
@@ -43,8 +45,7 @@
#include "dom/domMesh.h" #include "dom/domMesh.h"
#pragma GCC diagnostic pop #pragma GCC diagnostic pop
#if LL_MSVC #if LL_MSVC
#pragma warning (default : 4263) #pragma warning (pop)
#pragma warning (default : 4264)
#endif #endif
#ifdef LL_STANDALONE #ifdef LL_STANDALONE

10
indra/newview/llfloatermodelpreview.cpp
View File

@@ -32,6 +32,13 @@
#include "llviewerprecompiledheaders.h" #include "llviewerprecompiledheaders.h"
#if LL_MSVC
#pragma warning (disable : 4018)
#pragma warning (push)
#pragma warning (disable : 4068)
#pragma warning (disable : 4263)
#pragma warning (disable : 4264)
#endif
#pragma GCC diagnostic push #pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Woverloaded-virtual" #pragma GCC diagnostic ignored "-Woverloaded-virtual"
#include "dae.h" #include "dae.h"
@@ -56,6 +63,9 @@
#include "dom/domTranslate.h" #include "dom/domTranslate.h"
#include "dom/domVisual_scene.h" #include "dom/domVisual_scene.h"
#pragma GCC diagnostic pop #pragma GCC diagnostic pop
#if LL_MSVC
#pragma warning (pop)
#endif
#include "llfloatermodelpreview.h" #include "llfloatermodelpreview.h"