Added disabling of VisualStudio warning C4324 : structure was padded due to __declspec(align())

2011-06-17 05:57:29 +00:00
parent 4dd0782549
commit d5fa4dd272
2 changed files with 9 additions and 0 deletions
--- a/src/osg/glu/libtess/tess.h
+++ b/src/osg/glu/libtess/tess.h
@@ -38,6 +38,10 @@
 // #include <GL/glu.h>
 #include <osg/GLU>

+#if defined(_MSC_VER) && defined(OSG_DISABLE_MSVC_WARNINGS)
+    // disable "structure was padded due to __declspec(align())
+    #pragma warning( disable : 4324 )
+#endif

 #ifndef GLAPIENTRY
    #define GLAPIENTRY GL_APIENTRY 
--- a/src/osgPlugins/jpeg/ReaderWriterJPEG.cpp
+++ b/src/osgPlugins/jpeg/ReaderWriterJPEG.cpp
@@ -9,6 +9,11 @@

 #include <sstream>

+#if defined(_MSC_VER) && defined(OSG_DISABLE_MSVC_WARNINGS)
+    // disable "structure was padded due to __declspec(align())
+    #pragma warning( disable : 4324 )
+#endif
+
 /****************************************************************************
 *
 * Follows is code extracted from the simage library.  Original Authors: