harmless gcc warnings
This commit is contained in:
parent
3eb92cbe8a
commit
2e6bc99646
|
@ -255,7 +255,7 @@ public:
|
|||
|
||||
/// STL heap has the largest element as the first one.
|
||||
/// usually we mean priority as an error so we should invert the comparison
|
||||
inline const bool operator <(const HeapElem & h) const
|
||||
inline bool operator <(const HeapElem & h) const
|
||||
{
|
||||
return (pri > h.pri);
|
||||
//return (locModPtr->Priority() < h.locModPtr->Priority());
|
||||
|
|
|
@ -156,7 +156,7 @@ public:
|
|||
virtual const char *Info(TriMeshType &m) {
|
||||
mt = &m;
|
||||
static char buf[60];
|
||||
sprintf(buf,"%i -> %i %g\n", pos.V(0)-&m.vert[0], pos.V(1)-&m.vert[0],-_priority);
|
||||
sprintf(buf,"%i -> %i %g\n", int(pos.V(0)-&m.vert[0]), int(pos.V(1)-&m.vert[0]),-_priority);
|
||||
return buf;
|
||||
}
|
||||
|
||||
|
|
|
@ -299,7 +299,7 @@ static bool MakeBitTriQuadConventional(MeshType &m){
|
|||
static bool IsBitTriQuadConventional(MeshType &m){
|
||||
for (FaceIterator fi = m.face.begin(); fi!=m.face.end(); fi++) if (!fi->IsD()) {
|
||||
if (fi->IsAnyF())
|
||||
if ( fi->Flags() & ( FaceType::FAUX012 ) != FaceType::FAUX2 ) {
|
||||
if ( (fi->Flags() & FaceType::FAUX012 ) != FaceType::FAUX2 ) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -101,7 +101,7 @@ class HashedPoint3i : public Point3i
|
|||
{
|
||||
public:
|
||||
|
||||
const size_t Hash() const
|
||||
size_t Hash() const
|
||||
{
|
||||
return (V(0)*HASH_P0 ^ V(1)*HASH_P1 ^ V(2)*HASH_P2);
|
||||
}
|
||||
|
@ -239,7 +239,7 @@ class Clustering
|
|||
{
|
||||
public:
|
||||
CellType *v[3];
|
||||
const int ii(int i) const {return *((int *)(&(v[i])));}
|
||||
int ii(int i) const {return *((int *)(&(v[i])));}
|
||||
bool operator < ( const SimpleTri &p) const {
|
||||
return (v[2]!=p.v[2])?(v[2]<p.v[2]):
|
||||
(v[1]!=p.v[1])?(v[1]<p.v[1]):
|
||||
|
|
|
@ -100,7 +100,7 @@ public:
|
|||
|
||||
|
||||
private:
|
||||
typedef struct AdjVertex {
|
||||
struct AdjVertex {
|
||||
VertexType * vert;
|
||||
float doubleArea;
|
||||
bool isBorder;
|
||||
|
|
Loading…
Reference in New Issue