Changeset 9460

Timestamp:

01/07/09 13:27:45 (4 years ago)

Author:

robert

Message:

Fixed warnings

Location:

OpenSceneGraph/trunk/src

Files:

• osg/Geometry.cpp (modified) (6 diffs)
• osg/GraphicsThread.cpp (modified) (1 diff)
• osg/Hint.cpp (modified) (1 diff)
• osg/KdTree.cpp (modified) (3 diffs)
• osg/MatrixDecomposition.cpp (modified) (3 diffs)
• osg/OcclusionQueryNode.cpp (modified) (1 diff)
• osgDB/DatabasePager.cpp (modified) (1 diff)
• osgDB/ImagePager.cpp (modified) (2 diffs)
• osgDB/Registry.cpp (modified) (1 diff)
• osgGA/CameraViewSwitchManipulator.cpp (modified) (1 diff)

OpenSceneGraph/trunk/src/osg/Geometry.cpp

@@ -2111 +2111 @@
             }
         }
-    
+
+    protected:        
+        
+        AttributeFunctorArrayVisitor& operator = (const AttributeFunctorArrayVisitor&) { return *this; }
         Drawable::AttributeFunctor&   _af;
         Drawable::AttributeType       _type;
@@ -2172 +2175 @@
         }
     
+protected:
+
+        ConstAttributeFunctorArrayVisitor& operator = (const ConstAttributeFunctorArrayVisitor&) { return *this; }
+
         Drawable::ConstAttributeFunctor&    _af;
         Drawable::AttributeType             _type;
@@ -2945 +2952 @@
         // to set an element.
         template <class T>
-        osg::Array* create_noinline(const osg::Array& array, const osg::IndexArray& indices) {
+        osg::Array* create_noinline(const osg::Array& array, const osg::IndexArray& indices)
+        {
             T* newArray = 0;
             typedef typename T::ElementDataType EDT;
@@ -2962 +2970 @@
         }
 
-        osg::Array* create_noinline(const osg::Array& array, const osg::IndexArray& indices) {
-        switch (array.getType()) 
-            {
-            case(osg::Array::ByteArrayType):   return create_noinline<osg::ByteArray>(array,indices);
-            case(osg::Array::ShortArrayType):  return create_noinline<osg::ShortArray>(array,indices);
-            case(osg::Array::IntArrayType):    return create_noinline<osg::IntArray>(array,indices);
-            case(osg::Array::UByteArrayType):  return create_noinline<osg::UByteArray>(array,indices);
-            case(osg::Array::UShortArrayType): return create_noinline<osg::UShortArray>(array,indices);
-            case(osg::Array::UIntArrayType):   return create_noinline<osg::UIntArray>(array,indices);
-            case(osg::Array::Vec4ubArrayType): return create_noinline<osg::Vec4ubArray>(array,indices);
-            case(osg::Array::FloatArrayType):  return create_noinline<osg::FloatArray>(array,indices);
-            case(osg::Array::Vec2ArrayType):   return create_noinline<osg::Vec2Array>(array,indices);
-            case(osg::Array::Vec3ArrayType):   return create_noinline<osg::Vec3Array>(array,indices);
-            case(osg::Array::Vec4ArrayType):   return create_noinline<osg::Vec4Array>(array,indices);
-            case(osg::Array::Vec2dArrayType):   return create_noinline<osg::Vec2dArray>(array,indices);
-            case(osg::Array::Vec3dArrayType):   return create_noinline<osg::Vec3dArray>(array,indices);
-            case(osg::Array::Vec4dArrayType):   return create_noinline<osg::Vec4dArray>(array,indices);
-            default:
-                return NULL;
-        }
-    }
+        osg::Array* create_noinline(const osg::Array& array, const osg::IndexArray& indices)
+        {
+            switch (array.getType()) 
+            {
+                case(osg::Array::ByteArrayType):   return create_noinline<osg::ByteArray>(array,indices);
+                case(osg::Array::ShortArrayType):  return create_noinline<osg::ShortArray>(array,indices);
+                case(osg::Array::IntArrayType):    return create_noinline<osg::IntArray>(array,indices);
+                case(osg::Array::UByteArrayType):  return create_noinline<osg::UByteArray>(array,indices);
+                case(osg::Array::UShortArrayType): return create_noinline<osg::UShortArray>(array,indices);
+                case(osg::Array::UIntArrayType):   return create_noinline<osg::UIntArray>(array,indices);
+                case(osg::Array::Vec4ubArrayType): return create_noinline<osg::Vec4ubArray>(array,indices);
+                case(osg::Array::FloatArrayType):  return create_noinline<osg::FloatArray>(array,indices);
+                case(osg::Array::Vec2ArrayType):   return create_noinline<osg::Vec2Array>(array,indices);
+                case(osg::Array::Vec3ArrayType):   return create_noinline<osg::Vec3Array>(array,indices);
+                case(osg::Array::Vec4ArrayType):   return create_noinline<osg::Vec4Array>(array,indices);
+                case(osg::Array::Vec2dArrayType):   return create_noinline<osg::Vec2dArray>(array,indices);
+                case(osg::Array::Vec3dArrayType):   return create_noinline<osg::Vec3dArray>(array,indices);
+                case(osg::Array::Vec4dArrayType):   return create_noinline<osg::Vec4dArray>(array,indices);
+                default:
+                    return NULL;
+            }
+        }
 
         template <class TA, class TI>
-    osg::Array* create(const TA& array, const osg::IndexArray& indices) {
-        // We know that indices.getType returned the same thing as TI, but 
-        // we need to determine whether it is really an instance of TI, or 
-        // perhaps another subclass of osg::Array that contains the same 
-        // type of data.
-        const TI* ba(dynamic_cast<const TI*>(&indices));
-        if (ba != NULL) {
-        return create_inline(array,*ba);
-        }
-        else {
-        return create_noinline(array, _indices);
-        }
-    }
+        osg::Array* create(const TA& array, const osg::IndexArray& indices)
+        {
+            // We know that indices.getType returned the same thing as TI, but 
+            // we need to determine whether it is really an instance of TI, or 
+            // perhaps another subclass of osg::Array that contains the same 
+            // type of data.
+            const TI* ba(dynamic_cast<const TI*>(&indices));
+            if (ba != NULL) {
+                return create_inline(array,*ba);
+            }
+            else {
+                return create_noinline(array, _indices);
+            }
+        }
 
         template <class T>
@@ -3010 +3020 @@
             case(osg::Array::UShortArrayType): return create<T, osg::UShortArray>(array, _indices);
             case(osg::Array::UIntArrayType):   return create<T, osg::UIntArray>(array, _indices);
-            default: 
-        return create_noinline(array, _indices);
+            default:                           return create_noinline(array, _indices);
             }
             
@@ -3034 +3043 @@
         const osg::IndexArray& _indices;
         osg::Array* _targetArray;
+
+    protected:
+
+        ExpandIndexedArray& operator = (const ExpandIndexedArray&) { return *this; }
+
 };
 

OpenSceneGraph/trunk/src/osg/GraphicsThread.cpp

@@ -62 +62 @@
 }
 
-void BarrierOperation::operator () (Object* object)
+void BarrierOperation::operator () (Object* /*object*/)
 {
     if (_preBlockOp!=NO_OPERATION)

OpenSceneGraph/trunk/src/osg/Hint.cpp

@@ -17 +17 @@
 using namespace osg;
 
-void Hint::apply(State& state) const
+void Hint::apply(State& /*state*/) const
 {
     if (_target==GL_NONE || _mode==GL_NONE) return;

OpenSceneGraph/trunk/src/osg/KdTree.cpp

@@ -49 +49 @@
     CenterList          _centers;
 
+protected:
+
+    BuildKdTree& operator = (const BuildKdTree&) { return *this; }
 };
 
@@ -465 +468 @@
     osg::Vec3 _d_invY;
     osg::Vec3 _d_invZ;
+
+
+protected:
+
+    IntersectKdTree& operator = (const IntersectKdTree&) { return *this; }
 };
 
@@ -744 +752 @@
 
 KdTree::KdTree(const KdTree& rhs, const osg::CopyOp& copyop):
-    Shape(rhs)
+    Shape(rhs, copyop),
+    _vertices(rhs._vertices),
+    _kdNodes(rhs._kdNodes),
+    _triangles(rhs._triangles)
 {
 }

OpenSceneGraph/trunk/src/osg/MatrixDecomposition.cpp

@@ -468 +468 @@
         if (turn>=0) {
             Quat qtoz, qp;
-            unsigned neg[3], win;
+            unsigned int  win;
             double mag[3], t;
             switch (turn) {
@@ -481 +481 @@
             mag[2] = (double)q.y*q.z+(double)q.x*q.w;
 
-            for (i=0; i<3; i++) 
-                //JVK?????? 
-                //if (neg[i] = (mag[i]<0.0)) 
-                if (neg[i] == (mag[i]<0.0)) 
-                    mag[i] = -mag[i];
+            bool neg[3];
+            for (i=0; i<3; i++)
+            {
+                neg[i] = (mag[i]<0.0);
+                if (neg[i]) mag[i] = -mag[i];
+            }
 
             if (mag[0]>mag[1]) {
@@ -510 +511 @@
         else {
             double qa[4], pa[4];
-            unsigned lo, hi, neg[4], par = 0;
+            unsigned int lo, hi;
+            bool par = false;
+            bool neg[4];
             double all, big, two;
             qa[0] = q.x; qa[1] = q.y; qa[2] = q.z; qa[3] = q.w;
             for (i=0; i<4; i++) {
                 pa[i] = 0.0;
-                //if (neg[i] = (qa[i]<0.0)) qa[i] = -qa[i];
-                if (neg[i] == (qa[i]<0.0)) qa[i] = -qa[i];
+                neg[i] = (qa[i]<0.0);
+                if (neg[i]) qa[i] = -qa[i];
                 par ^= neg[i];
             }

OpenSceneGraph/trunk/src/osg/OcclusionQueryNode.cpp

@@ -300 +300 @@
     META_Object( osgOQ, ClearQueriesCallback )
 
-    virtual void operator() (const osg::Camera& camera) const
+    virtual void operator() (const osg::Camera&) const
     {
         if (!_rqcb)

OpenSceneGraph/trunk/src/osgDB/DatabasePager.cpp

@@ -1880 +1880 @@
     DatabasePager::PagedLODList& _activePagedLODList;
     int _frameNumber;
+        
+protected:
+    
+    FindPagedLODsVisitor& operator = (const FindPagedLODsVisitor&) { return *this; }
 };
 

OpenSceneGraph/trunk/src/osgDB/ImagePager.cpp

@@ -295 +295 @@
 }
 
-void ImagePager::requestImageFile(const std::string& fileName,osg::Object* attachmentPoint, int attachmentIndex, double timeToMergeBy, const osg::FrameStamp* framestamp)
+void ImagePager::requestImageFile(const std::string& fileName,osg::Object* attachmentPoint, int attachmentIndex, double timeToMergeBy, const osg::FrameStamp*)
 {
     osg::notify(osg::INFO)<<"ImagePager::requestNodeFile("<<fileName<<")"<<std::endl;
@@ -334 +334 @@
 }
 
-void ImagePager::updateSceneGraph(const osg::FrameStamp &frameStamp)
+void ImagePager::updateSceneGraph(const osg::FrameStamp&)
 {
     OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_completedQueue->_requestMutex);

OpenSceneGraph/trunk/src/osgDB/Registry.cpp

@@ -82 +82 @@
 
 protected:
+
+    AvailableReaderWriterIterator& operator = (const AvailableReaderWriterIterator&) { return *this; }
 
     Registry::ReaderWriterList&     _rwList;

OpenSceneGraph/trunk/src/osgGA/CameraViewSwitchManipulator.cpp

@@ -40 +40 @@
 }
 
-bool CameraViewSwitchManipulator::handle(const GUIEventAdapter& ea,GUIActionAdapter& us)
+bool CameraViewSwitchManipulator::handle(const GUIEventAdapter& ea,GUIActionAdapter&)
 {
     if (ea.getHandled()) return false;