manolas
/
vcglib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

typenames and qualifiers for gcc compliance

This commit is contained in:
Paolo Cignoni 2006-10-15 07:31:22 +00:00
parent 4b46ed3c4e
commit 7be5d031b9
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
vcg/complex/local_optimization/tri_edge_collapse.h
View File

@ -22,6 +22,9 @@
****************************************************************************/ ****************************************************************************/
/**************************************************************************** /****************************************************************************
$Log: not supported by cvs2svn $ $Log: not supported by cvs2svn $
Revision 1.18 2006/10/09 20:09:40 cignoni
Changed some access to VertexFaceIterator to reflect the shorter new operators.
Revision 1.17 2005/10/12 10:44:01 cignoni Revision 1.17 2005/10/12 10:44:01 cignoni
Now creation of new edge use Ordered() constructor to comply the fact that the basic collapse is simmetric. Now creation of new edge use Ordered() constructor to comply the fact that the basic collapse is simmetric.
@ -101,7 +104,7 @@ public:
protected: protected:
typedef typename TriMeshType::FaceType FaceType; typedef typename TriMeshType::FaceType FaceType;
typedef typename TriMeshType::FaceType::VertexType VertexType; typedef typename TriMeshType::FaceType::VertexType VertexType;
typedef typename FaceType::EdgeType EdgeType; typedef typename VertexType::EdgeType EdgeType;
typedef typename FaceType::VertexType::CoordType CoordType; typedef typename FaceType::VertexType::CoordType CoordType;
typedef typename TriMeshType::VertexType::ScalarType ScalarType; typedef typename TriMeshType::VertexType::ScalarType ScalarType;
typedef typename LocalOptimization<TriMeshType>::HeapElem HeapElem; typedef typename LocalOptimization<TriMeshType>::HeapElem HeapElem;

5
vcg/complex/local_optimization/tri_edge_collapse_quadric.h
View File

@ -24,6 +24,9 @@
History History
$Log: not supported by cvs2svn $ $Log: not supported by cvs2svn $
Revision 1.10 2006/10/09 20:12:55 cignoni
Heavyly restructured for meshlab inclusion. Now the access to the quadric elements are mediated by a static helper class.
Revision 1.9 2006/10/07 17:20:25 cignoni Revision 1.9 2006/10/07 17:20:25 cignoni
Updated to the new style face->Normal() becomes Normal(face) Updated to the new style face->Normal() becomes Normal(face)
@ -142,7 +145,7 @@ public:
}; };
template<class TriMeshType,class MYTYPE, class HelperType = QInfoStandard<TriMeshType::VertexType> > template<class TriMeshType,class MYTYPE, class HelperType = QInfoStandard<typename TriMeshType::VertexType> >
class TriEdgeCollapseQuadric: public TriEdgeCollapse< TriMeshType, MYTYPE> class TriEdgeCollapseQuadric: public TriEdgeCollapse< TriMeshType, MYTYPE>
{ {
public: public:

5
vcg/complex/trimesh/clean.h
View File

@ -24,6 +24,9 @@
History History
$Log: not supported by cvs2svn $ $Log: not supported by cvs2svn $
Revision 1.41 2006/10/09 20:06:46 cignoni
Added Remove NonManifoldFace
Revision 1.40 2006/05/25 09:41:09 cignoni Revision 1.40 2006/05/25 09:41:09 cignoni
missing std and other gcc detected syntax errors missing std and other gcc detected syntax errors
@ -393,7 +396,7 @@ private:
{ {
FaceIterator fi; FaceIterator fi;
int count_fd = 0; int count_fd = 0;
vector<FacePointer> ToDelVec; std::vector<FacePointer> ToDelVec;
for(fi=m.face.begin(); fi!=m.face.end();++fi) for(fi=m.face.begin(); fi!=m.face.end();++fi)
if (!fi->IsD()) if (!fi->IsD())