Skip to content

Commit

Permalink
From Jean-Sebastien Guay, warning fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
robertosfield committed Feb 5, 2009
1 parent 47f0a7b commit 1f2bd3c
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 0 deletions.
2 changes: 2 additions & 0 deletions examples/osglauncher/osglauncher.cpp
Expand Up @@ -194,6 +194,8 @@ class Xample
{
return app;
}
private:
Xample() {}
}; // end class Xample


Expand Down
3 changes: 3 additions & 0 deletions examples/osgviewerGLUT/osgviewerGLUT.cpp
Expand Up @@ -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 )
Expand All @@ -29,6 +31,7 @@
#ifdef WIN32
#include <windows.h>
#endif

#ifdef __APPLE__
# include <GLUT/glut.h>
#else
Expand Down
2 changes: 2 additions & 0 deletions src/osgPlugins/cfg/ConfigLexer.cpp
Expand Up @@ -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)
Expand Down
1 change: 1 addition & 0 deletions src/osgUtil/TriStrip_graph_array.h
Expand Up @@ -79,6 +79,7 @@ class graph_array
class arc
{
public:
arc() {}
arc & mark() { m_Marker = true; return (* this); }
arc & unmark() { m_Marker = false; return (* this); }
bool marked() const { return m_Marker; }
Expand Down

0 comments on commit 1f2bd3c

Please sign in to comment.