Warnings fixes for VS.

This commit is contained in:
Robert Osfield
2009-02-02 20:35:19 +00:00
parent 965b7ddc72
commit 1153ea5feb
20 changed files with 155 additions and 11 deletions

View File

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

View File

@@ -117,7 +117,7 @@ public:
}
};
Edge() {}
Edge(): ib_(0), ie_(0), ibs_(0), ies_(0), duplicate_(false) {}
Edge(Vertex_index ib, Vertex_index ie) : ib_(ib), ie_(ie), ibs_(osg::minimum(ib, ie)), ies_(osg::maximum(ib, ie)), duplicate_(false) {}
// first endpoint
@@ -150,6 +150,13 @@ private:
class Triangle
{
public:
Triangle():
a_(0),
b_(0),
c_(0) {}
Triangle(Vertex_index a, Vertex_index b, Vertex_index c, osg::Vec3Array *points)
: a_(a),
b_(b),
@@ -161,6 +168,21 @@ public:
edge_[2] = Edge(c_, a_);
}
Triangle& operator = (const Triangle& rhs)
{
if (&rhs==this) return *this;
a_ = rhs.a_;
b_ = rhs.b_;
c_ = rhs.c_;
cc_ = rhs.cc_;
edge_[0] = rhs.edge_[0];
edge_[1] = rhs.edge_[1];
edge_[2] = rhs.edge_[2];
return *this;
}
inline Vertex_index a() const { return a_; }
inline Vertex_index b() const { return b_; }
inline Vertex_index c() const { return c_; }
@@ -321,6 +343,7 @@ public:
private:
bool intersect(const osg::Vec2 p1,const osg::Vec2 p2,const osg::Vec2 p3,const osg::Vec2 p4) const
{
// intersection point of p1,p2 and p3,p4

View File

@@ -428,6 +428,10 @@ class CopyVertexArrayToPointsVisitor : public osg::ArrayVisitor
}
EdgeCollector::PointList& _pointList;
protected:
CopyVertexArrayToPointsVisitor& operator = (const CopyVertexArrayToPointsVisitor&) { return *this; }
};
EdgeCollector::~EdgeCollector()

View File

@@ -418,6 +418,11 @@ struct TriangleHit
const osg::Vec3* _v2;
float _r3;
const osg::Vec3* _v3;
protected:
TriangleHit& operator = (const TriangleHit&) { return *this; }
};

View File

@@ -45,7 +45,11 @@ namespace LineSegmentIntersectorUtils
float _r2;
const osg::Vec3* _v2;
float _r3;
const osg::Vec3* _v3;
const osg::Vec3* _v3;
protected:
TriangleIntersection& operator = (const TriangleIntersection&) { return *this; }
};
typedef std::multimap<float,TriangleIntersection> TriangleIntersections;

View File

@@ -1348,6 +1348,11 @@ class CopyArrayToPointsVisitor : public osg::ArrayVisitor
}
EdgeCollapse::PointList& _pointList;
protected:
CopyArrayToPointsVisitor& operator = (const CopyArrayToPointsVisitor&) { return *this; }
};
class CopyVertexArrayToPointsVisitor : public osg::ArrayVisitor
@@ -1400,6 +1405,11 @@ class CopyVertexArrayToPointsVisitor : public osg::ArrayVisitor
}
EdgeCollapse::PointList& _pointList;
protected:
CopyVertexArrayToPointsVisitor& operator = (const CopyVertexArrayToPointsVisitor&) { return *this; }
};
void EdgeCollapse::setGeometry(osg::Geometry* geometry, const Simplifier::IndexList& protectedPoints)
@@ -1567,6 +1577,10 @@ class CopyPointsToArrayVisitor : public osg::ArrayVisitor
EdgeCollapse::PointList& _pointList;
unsigned int _index;
protected:
CopyPointsToArrayVisitor& operator = (CopyPointsToArrayVisitor&) { return *this; }
};
class NormalizeArrayVisitor : public osg::ArrayVisitor
@@ -1633,6 +1647,10 @@ class CopyPointsToVertexArrayVisitor : public osg::ArrayVisitor
}
EdgeCollapse::PointList& _pointList;
protected:
CopyPointsToVertexArrayVisitor& operator = (CopyPointsToArrayVisitor&) { return *this; }
};

View File

@@ -46,6 +46,10 @@ class WriteValue : public osg::ConstValueVisitor
virtual void apply(const Vec2& v) { _o << v; }
virtual void apply(const Vec3& v) { _o << v; }
virtual void apply(const Vec4& v) { _o << v; }
protected:
WriteValue& operator = (const WriteValue&) { return *this; }
};
@@ -129,6 +133,10 @@ struct VertexAttribComparitor
}
}
protected:
VertexAttribComparitor& operator = (const VertexAttribComparitor&) { return *this; }
};
class RemapArray : public osg::ArrayVisitor
@@ -163,6 +171,10 @@ class RemapArray : public osg::ArrayVisitor
virtual void apply(osg::Vec2Array& array) { remap(array); }
virtual void apply(osg::Vec3Array& array) { remap(array); }
virtual void apply(osg::Vec4Array& array) { remap(array); }
protected:
RemapArray& operator = (const RemapArray&) { return *this; }
};
struct MyTriangleOperator

View File

@@ -194,6 +194,9 @@ public:
// friend void swap(_mytype & Left, _mytype & Right) { Left.swap(Right); }
protected:
graph_array& operator = (const graph_array&) { return *this; }
size_t m_NbArcs;
std::vector<node> m_Nodes;
};