From a5a267d3057c20d2518259ee11ac1113060cfe06 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Tue, 28 May 2002 16:11:49 +0000 Subject: [PATCH] Added pragma to disable warning under VisualStudio.NET. --- include/osg/Export | 7 ++++--- include/osgDB/Export | 11 ++++++----- include/osgGA/Export | 10 ++++++---- include/osgGLUT/Export | 10 ++++++---- include/osgText/Export | 3 ++- include/osgUtil/Export | 10 ++++++---- 6 files changed, 30 insertions(+), 21 deletions(-) diff --git a/include/osg/Export b/include/osg/Export index 685e41d20..8d09ec540 100644 --- a/include/osg/Export +++ b/include/osg/Export @@ -7,10 +7,11 @@ #if defined(_MSC_VER) #pragma warning( disable : 4244 ) - #pragma warning( disable : 4251 ) - #pragma warning( disable : 4275 ) - #pragma warning( disable : 4786 ) + #pragma warning( disable : 4251 ) + #pragma warning( disable : 4267 ) + #pragma warning( disable : 4275 ) #pragma warning( disable : 4290 ) + #pragma warning( disable : 4786 ) #endif #if defined(_MSC_VER) || defined(__CYGWIN__) || defined(__MINGW32__) || defined( __BCPLUSPLUS__) || defined( __MWERKS__) diff --git a/include/osgDB/Export b/include/osgDB/Export index ed6051fea..837da4490 100644 --- a/include/osgDB/Export +++ b/include/osgDB/Export @@ -6,11 +6,12 @@ #define OSGDB_EXPORT_ 1 #if defined(_MSC_VER) - #pragma warning( disable : 4244 ) - #pragma warning( disable : 4251 ) - #pragma warning( disable : 4275 ) - #pragma warning( disable : 4786 ) - + #pragma warning( disable : 4244 ) + #pragma warning( disable : 4251 ) + #pragma warning( disable : 4267 ) + #pragma warning( disable : 4275 ) + #pragma warning( disable : 4290 ) + #pragma warning( disable : 4786 ) #endif #if defined(_MSC_VER) || defined(__CYGWIN__) || defined(__MINGW32__) || defined( __BCPLUSPLUS__) || defined( __MWERKS__) diff --git a/include/osgGA/Export b/include/osgGA/Export index a4829cb37..4f8789671 100644 --- a/include/osgGA/Export +++ b/include/osgGA/Export @@ -7,10 +7,12 @@ #define OSGGA_EXPORT_ 1 #if defined(WIN32) && !(defined(__CYGWIN__) || defined(__MINGW32__)) - #pragma warning( disable : 4244 ) - #pragma warning( disable : 4251 ) - #pragma warning( disable : 4275 ) - #pragma warning( disable : 4786 ) + #pragma warning( disable : 4244 ) + #pragma warning( disable : 4251 ) + #pragma warning( disable : 4267 ) + #pragma warning( disable : 4275 ) + #pragma warning( disable : 4290 ) + #pragma warning( disable : 4786 ) #endif #if defined(_MSC_VER) || defined(__CYGWIN__) || defined(__MINGW32__) || defined( __BCPLUSPLUS__) || defined( __MWERKS__) diff --git a/include/osgGLUT/Export b/include/osgGLUT/Export index a75739fdb..7b614d0ef 100644 --- a/include/osgGLUT/Export +++ b/include/osgGLUT/Export @@ -7,10 +7,12 @@ #define OSGGLUT_EXPORT_ 1 #if defined(WIN32) && !(defined(__CYGWIN__) || defined(__MINGW32__)) - #pragma warning( disable : 4244 ) - #pragma warning( disable : 4251 ) - #pragma warning( disable : 4275 ) - #pragma warning( disable : 4786 ) + #pragma warning( disable : 4244 ) + #pragma warning( disable : 4251 ) + #pragma warning( disable : 4267 ) + #pragma warning( disable : 4275 ) + #pragma warning( disable : 4290 ) + #pragma warning( disable : 4786 ) #endif #if defined(_MSC_VER) || defined(__CYGWIN__) || defined(__MINGW32__) || defined( __BCPLUSPLUS__) || defined( __MWERKS__) diff --git a/include/osgText/Export b/include/osgText/Export index 7488ec829..cab008c89 100644 --- a/include/osgText/Export +++ b/include/osgText/Export @@ -8,9 +8,10 @@ #if defined(_MSC_VER) #pragma warning( disable : 4244 ) #pragma warning( disable : 4251 ) + #pragma warning( disable : 4267 ) #pragma warning( disable : 4275 ) + #pragma warning( disable : 4290 ) #pragma warning( disable : 4786 ) - #endif #if defined(_MSC_VER) || defined(__CYGWIN__) || defined(__MINGW32__) || defined( __BCPLUSPLUS__) diff --git a/include/osgUtil/Export b/include/osgUtil/Export index 38b826e17..455117f12 100644 --- a/include/osgUtil/Export +++ b/include/osgUtil/Export @@ -7,10 +7,12 @@ #define OSGUTIL_EXPORT_ 1 #if defined(_MSC_VER) - #pragma warning( disable : 4244 ) - #pragma warning( disable : 4251 ) - #pragma warning( disable : 4275 ) - #pragma warning( disable : 4786 ) + #pragma warning( disable : 4244 ) + #pragma warning( disable : 4251 ) + #pragma warning( disable : 4267 ) + #pragma warning( disable : 4275 ) + #pragma warning( disable : 4290 ) + #pragma warning( disable : 4786 ) #endif #if defined(_MSC_VER) || defined(__CYGWIN__) || defined(__MINGW32__) || defined( __BCPLUSPLUS__) || defined( __MWERKS__)