FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updatedwidley used includes to remove most of the float/double warnings

Browse Source 
generated when compiling under Windows with STLport.
This commit is contained in:
Robert Osfield 2001-12-14 18:06:34 +00:00
parent c6ee3ff041
commit 6070a9e1b1
9 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/osg/Camera
View File

@ -185,7 +185,7 @@ class SG_EXPORT Camera: public osg::Referenced
const Vec3 getSideVector() const;
/** get focal distance.*/
inline const float getFocalLength() const { return _focalLength; }
inline const double getFocalLength() const { return _focalLength; }
enum TransformMode

1
include/osg/Export
View File

@ -6,6 +6,7 @@
#define OSG_EXPORT 1
#ifdef WIN32
#pragma warning( disable : 4244 )
#pragma warning( disable : 4251 )
#pragma warning( disable : 4275 )
#pragma warning( disable : 4786 )

25
include/osg/Math
View File

@ -7,6 +7,11 @@
#include <math.h>
#if defined(WIN32)
// needed for _isnan & _finite used below.
#include <float.h>
#endif
#if defined(WIN32) || defined (macintosh)
#include <float.h>
#define M_E 2.7182818284590452354
@ -29,41 +34,37 @@
// where they arent in math.h
#ifndef acosf
#define acosf acos
#define acosf (float)acos
#endif
#ifndef asinf
#define asinf asin
#define asinf (float)asin
#endif
#ifndef cosf
#define cosf cos
#define cosf (float)cos
#endif
#ifndef sinf
#define sinf sin
#define sinf (float)sin
#endif
#ifndef logf
#define logf log
#define logf (float)log
#endif
#ifndef floorf
#define floorf floor
#define floorf (float)floor
#endif
#ifndef powf
#define powf pow
#define powf (float)pow
#endif
#ifndef sqrtf
#define sqrtf sqrt
#define sqrtf (float)sqrt
#endif
#if defined(WIN32)
// needed for _isnan & _finite used below.
#include <float.h>
#endif
namespace osg {

1
include/osgDB/Export
View File

@ -6,6 +6,7 @@
#define OSGDB_EXPORT_ 1
#ifdef WIN32
#pragma warning( disable : 4244 )
#pragma warning( disable : 4251 )
#pragma warning( disable : 4275 )
#pragma warning( disable : 4786 )

1
include/osgGLUT/Export
View File

@ -7,6 +7,7 @@
#define OSGGLUT_EXPORT_ 1
#ifdef WIN32
#pragma warning( disable : 4244 )
#pragma warning( disable : 4251 )
#pragma warning( disable : 4275 )
#pragma warning( disable : 4786 )

1
include/osgText/Export
View File

@ -6,6 +6,7 @@
#define OSGTEXT_EXPORT_ 1
#ifdef WIN32
#pragma warning( disable : 4244 )
#pragma warning( disable : 4251 )
#pragma warning( disable : 4275 )
#pragma warning( disable : 4786 )

1
include/osgUtil/Export
View File

@ -7,6 +7,7 @@
#define OSGUTIL_EXPORT_ 1
#ifdef WIN32
#pragma warning( disable : 4244 )
#pragma warning( disable : 4251 )
#pragma warning( disable : 4275 )
#pragma warning( disable : 4786 )

1
include/osgWX/Export
View File

@ -7,6 +7,7 @@
#define OSGWX_EXPORT_ 1
#ifdef WIN32
#pragma warning( disable : 4244 )
#pragma warning( disable : 4251 )
#pragma warning( disable : 4275 )
#pragma warning( disable : 4786 )

1
src/osgText/FTGL.h
View File

@ -4,6 +4,7 @@
#ifdef WIN32
// stl stuff
#pragma warning( disable : 4244 )
#pragma warning( disable : 4251 )
#pragma warning( disable : 4275 )
#pragma warning( disable : 4786 )