Warning fixes

This commit is contained in:
Robert Osfield
2009-02-03 15:28:53 +00:00
parent abb63e3199
commit 734463fcc7
22 changed files with 107 additions and 22 deletions

View File

@@ -78,7 +78,9 @@ class PrintVisitor : public NodeVisitor
virtual void apply(LOD& node) { apply((Group&)node); }
protected:
PrintVisitor& operator = (const PrintVisitor&) { return *this; }
std::ostream& _out;
int _indent;
int _step;

View File

@@ -9,6 +9,10 @@
#define YY_FLEX_MAJOR_VERSION 2
#define YY_FLEX_MINOR_VERSION 5
#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)
#endif
/* cfront 1.2 defines "c_plusplus" instead of "__cplusplus" */

View File

@@ -56,6 +56,10 @@ extern "C"
#include <assert.h>
#include <stdlib.h>
#if defined(_MSC_VER) && defined(OSG_DISABLE_MSVC_WARNINGS)
#pragma warning( disable : 4611 )
#endif
namespace osgDBJPEG
{

View File

@@ -17,8 +17,17 @@ namespace lwo2
// basic types
struct ID4 {
char id[4];
struct ID4
{
ID4()
{
id[0] = 0;
id[1] = 0;
id[2] = 0;
id[3] = 0;
}
char id[4];
};
typedef signed char I1;

View File

@@ -70,6 +70,9 @@ class ValueVisitor : public osg::ValueVisitor {
_fout << v[0] << ' ' << v[1] << ' ' << v[2];
}
private:
ValueVisitor& operator = (const ValueVisitor&) { return *this; }
std::ostream& _fout;
osg::Matrix _m;
bool _applyMatrix, _isNormal;
@@ -302,6 +305,9 @@ class PrimitiveIndexWriter : public osg::PrimitiveIndexFunctor {
}
private:
PrimitiveIndexWriter& operator = (const PrimitiveIndexWriter&) { return *this; }
std::ostream& _fout;
GLenum _modeCache;
std::vector<GLuint> _indexCache;
@@ -309,8 +315,6 @@ class PrimitiveIndexWriter : public osg::PrimitiveIndexFunctor {
bool _hasNormalCoords, _hasTexCoords;
osg::Geometry* _geo;
unsigned int _normalIndex;
};

View File

@@ -652,6 +652,8 @@ public:
protected:
osg::Node* seamReplacement(osg::Node* node);
SeamFinder& operator = (const SeamFinder&) { return *this; }
int _x, _y, _lod;
const TXPArchive::TileInfo& _info;

View File

@@ -62,6 +62,10 @@ public:
NodeVisitor::apply(node);
}
osgDB::Output &_fw;
protected:
Dump2Osg& operator = (const Dump2Osg&) { return *this; }
};

View File

@@ -293,6 +293,9 @@ public:
traverse(group);
}
protected:
FindEmptyGroupsVisitor& operator = (const FindEmptyGroupsVisitor&) { return *this; }
osg::NodeList& _nl;
};

View File

@@ -1074,21 +1074,15 @@ bool trpgTexture::isValid() const
switch (mode) {
case External:
return (name != NULL);
break;
case Local:
return (type != trpg_Unknown && sizeX != -1 && sizeY != -1);
break;
case Global:
return (type != trpg_Unknown);
break;
case Template:
return (type != trpg_Unknown && sizeX != -1 && sizeY != -1);
break;
default:
return false;
}
return false;
}