From Jean-Sebastien Guay, warning fixes
This commit is contained in:
parent
df8de6403a
commit
baac534bcc
@ -194,6 +194,8 @@ class Xample
|
||||
{
|
||||
return app;
|
||||
}
|
||||
private:
|
||||
Xample() {}
|
||||
}; // end class Xample
|
||||
|
||||
|
||||
|
@ -20,6 +20,8 @@
|
||||
// Simple example using GLUT to create an OpenGL window and OSG for rendering.
|
||||
// Derived from osgGLUTsimple.cpp and osgkeyboardmouse.cpp
|
||||
|
||||
#include <osg/Config>
|
||||
|
||||
#if defined(_MSC_VER) && defined(OSG_DISABLE_MSVC_WARNINGS)
|
||||
// disable warning "glutCreateMenu_ATEXIT_HACK' : unreferenced local function has been removed"
|
||||
#pragma warning( disable : 4505 )
|
||||
@ -29,6 +31,7 @@
|
||||
#ifdef WIN32
|
||||
#include <windows.h>
|
||||
#endif
|
||||
|
||||
#ifdef __APPLE__
|
||||
# include <GLUT/glut.h>
|
||||
#else
|
||||
|
@ -9,6 +9,8 @@
|
||||
#define YY_FLEX_MAJOR_VERSION 2
|
||||
#define YY_FLEX_MINOR_VERSION 5
|
||||
|
||||
#include <osg/Config>
|
||||
|
||||
#if defined(_MSC_VER) && defined(OSG_DISABLE_MSVC_WARNINGS)
|
||||
// disable '=' : conversion from 'int' to 'char', possible loss of data style warnings
|
||||
#pragma warning( disable : 4244)
|
||||
|
@ -79,6 +79,7 @@ public:
|
||||
class arc
|
||||
{
|
||||
public:
|
||||
arc() {}
|
||||
arc & mark() { m_Marker = true; return (* this); }
|
||||
arc & unmark() { m_Marker = false; return (* this); }
|
||||
bool marked() const { return m_Marker; }
|
||||
|
Loading…
Reference in New Issue
Block a user