Warning fixes

examples/osgcluster/broadcaster.cpp

@@ -196,7 +196,7 @@ void Broadcaster::sync( void )
     unsigned int size = sizeof( SOCKADDR_IN );
     sendto( _so, (const char *)_buffer, _buffer_size, 0, (struct sockaddr *)&saddr, size );
     int err = WSAGetLastError ();
-    int *dum = (int*) _buffer;
+    if (err!=0) fprintf( stderr, "Broadcaster::sync() - error %d\n",err );
 #else
     unsigned int size = sizeof( struct sockaddr_in );
     sendto( _so, (const void *)_buffer, _buffer_size, 0, (struct sockaddr *)&saddr, size );

examples/osgcluster/osgcluster.cpp

@@ -386,7 +386,7 @@ class DataConverter
                 _swapBytes = !_swapBytes;
             }
             
-            cameraPacket._masterKilled = readUInt();
+            cameraPacket._masterKilled = readUInt()!=0;
             
             read(cameraPacket._matrix);
             read(cameraPacket._frameStamp);

examples/osgcluster/receiver.cpp

@@ -142,7 +142,7 @@ void Receiver::sync( void )
     recvfrom( _so, (char *)_buffer, _buffer_size, 0, (sockaddr*)&saddr, &size );
 //    recvfrom(sock_Receive, szMessage, 256, 0, (sockaddr*)&addr_Cli, &clilen)
     int err = WSAGetLastError ();
-    int *dum = (int*) _buffer;
+    if (err!=0) fprintf( stderr, "Receiver::sync() - error %d\n",err );
 
     while( select( _so+1, &fdset, 0L, 0L, &tv ) )
     {

examples/osgimagesequence/osgimagesequence.cpp

@@ -230,6 +230,10 @@ protected:
         }
         
         ImageStreamList& _imageStreamList;
+        
+    protected:
+    
+        FindImageStreamsVisitor& operator = (const FindImageStreamsVisitor&) { return *this; }
     };
 
 

examples/osgmovie/osgmovie.cpp

@@ -108,6 +108,11 @@ protected:
         }
         
         ImageStreamList& _imageStreamList;
+
+    protected:
+    
+        FindImageStreamsVisitor& operator = (const FindImageStreamsVisitor&) { return *this; }
+
     };
 
 

examples/osgunittests/UnitTestFramework.cpp

@@ -290,7 +290,8 @@ bool TestRunner::visitEnter( TestSuite* pSuite )
 
 namespace osgUtx{
 
-struct isSpecified{
+struct isSpecified
+{
 
     const std::string& pTestName_;
 
@@ -299,6 +300,10 @@ struct isSpecified{
     bool operator()(const std::string& specifiedTest){
         return pTestName_.find(specifiedTest) == 0;
     }
+
+protected:
+
+    isSpecified& operator = (const isSpecified&) { return *this; }
 };
 
 }

examples/osgunittests/UnitTestFramework.h

@@ -386,6 +386,29 @@ its result, and a textual description of any problems.
 class TestRecord
 {
     public:
+    
+        TestRecord() {}
+        
+        TestRecord(const TestRecord& rhs):
+            name_(rhs.name_),
+            start_(rhs.start_),
+            stop_(rhs.stop_),
+            result_(rhs.result_),
+            problem_(rhs.problem_)
+        {}
+        
+        TestRecord& operator = (const TestRecord& rhs)
+        {
+            if (&rhs==this) return *this;
+
+            name_ = rhs.name_;
+            start_ = rhs.start_;
+            stop_ = rhs.stop_;
+            result_ = rhs.result_;
+            problem_ = rhs.problem_;
+
+            return *this;
+        }
 
         void start();
         void stop();
@@ -394,8 +417,6 @@ class TestRecord
         void log(const std::exception& e);
         void log(const std::string& s);
 
-        // Default copy construction and assignment are OK
-
         // FIXME: Add accessors?
 
     private:

include/osgIntrospection/Reflector

@@ -631,6 +631,10 @@ namespace osgIntrospection
                     values.push_back(Value(i->first).convertTo(_itype));
                 }
             }
+
+        protected:
+        
+            Indexer& operator = (const Indexer&) { return *this; }
         };
 
         struct Remover: PropertyRemover

include/osgIntrospection/TypedConstructorInfo

@@ -32,7 +32,6 @@ namespace osgIntrospection
 
         Value createInstance(ValueList&  /*args*/) const
         {
-
             return IC::create();
         }
 

include/osgIntrospection/TypedMethodInfo

@@ -15,7 +15,7 @@
 #ifndef OSGINTROSPECTION_TYPEDMETHODINFO_
 #define OSGINTROSPECTION_TYPEDMETHODINFO_
 
-#if defined(_MSC_VER)
+#if defined(_MSC_VER) && defined(OSG_DISABLE_MSVC_WARNINGS)
     // disable for this header the VS warning C4121 : "alignment of a member was sensitive to packing"
     #pragma warning( push )
     #pragma warning( disable : 4121)

src/OpenThreads/win32/Win32Thread.cpp

@@ -136,8 +136,8 @@ namespace OpenThreads {
         // Print information related to thread schduling parameters.
         //
         static void PrintThreadSchedulingInfo(Thread *thread) {
-            Win32ThreadPrivateData *pd =
-                static_cast<Win32ThreadPrivateData *>(thread->_prvData);
+
+            // Win32ThreadPrivateData *pd = static_cast<Win32ThreadPrivateData *>(thread->_prvData);
 
             std::cout<<"Thread "<< thread <<" priority : ";
 

src/osgPlugins/3ds/ReaderWriter3DS.cpp

@@ -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;

src/osgPlugins/cfg/ConfigLexer.cpp

@@ -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" */

src/osgPlugins/jpeg/ReaderWriterJPEG.cpp

@@ -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
 {
 

src/osgPlugins/lwo/lwo2types.h

@@ -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;

src/osgPlugins/obj/OBJWriterNodeVisitor.cpp

@@ -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;
-
-
 };
 
 

src/osgPlugins/txp/ReaderWriterTXP.cpp

@@ -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;

src/osgPlugins/txp/TXPIO.cpp

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

src/osgPlugins/txp/TXPParser.cpp

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

src/osgPlugins/txp/trpage_material.cpp

@@ -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;
 }
 
 

src/osgUtil/Simplifier.cpp

@@ -1650,7 +1650,7 @@ class CopyPointsToVertexArrayVisitor : public osg::ArrayVisitor
         
     protected:
     
-        CopyPointsToVertexArrayVisitor& operator = (CopyPointsToArrayVisitor&) { return *this; }
+        CopyPointsToVertexArrayVisitor& operator = (const CopyPointsToArrayVisitor&) { return *this; }
 };
 
 

src/osgUtil/TriStrip_tri_stripper.h

@@ -82,7 +82,28 @@ class triangle
 {
 public:
     triangle();
+    
+    triangle(const triangle& tri):
+        m_A(tri.m_A),
+        m_B(tri.m_B),
+        m_C(tri.m_C),
+        m_StripID(tri.m_StripID)
+    {
+    }
+    
     triangle(const indice A, const indice B, const indice C);
+    
+    triangle& operator = (const triangle& tri)
+    {
+        if (&tri==this) return *this;
+        
+        m_A = tri.m_A;
+        m_B = tri.m_B;
+        m_C = tri.m_C;
+        m_StripID = tri.m_StripID;
+        
+        return *this;
+    }
 
     void SetStripID(const size_t StripID);