From 992a087d8119686fdccf979f83728585541fa5ee Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Wed, 13 Aug 2008 01:18:04 +0000
Subject: [PATCH] fix gcc warnings
---
Makefile | 2 +-
Mesh/Makefile | 14 +++++++++++++-
Mesh/PartitionObjects.h | 2 +-
3 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/Makefile b/Makefile
index 35169e6cc0..a06823caa9 100644
--- a/Makefile
+++ b/Makefile
@@ -152,7 +152,7 @@ clean-fm:
depend: initialtag
for i in ${GMSH_DIRS};\
- do (cd $$i && ${MAKE} depend "FLAGS=-DHAVE_GSL -DHAVE_FLTK"); done
+ do (cd $$i && ${MAKE} depend "FLAGS=-DHAVE_GSL -DHAVE_FLTK -DHAVE_METIS"); done
nodepend:
for i in ${GMSH_DIRS} ; do \
diff --git a/Mesh/Makefile b/Mesh/Makefile
index 0566d60546..ac91f8f3bd 100644
--- a/Mesh/Makefile
+++ b/Mesh/Makefile
@@ -391,4 +391,16 @@ HighOrder.o: HighOrder.cpp HighOrder.h ../Geo/GModel.h ../Geo/GVertex.h \
../Numeric/NumericEmbedded.h ../Common/Context.h ../Geo/CGNSOptions.h \
../Mesh/PartitionOptions.h ../Common/GmshMatrix.h \
../Numeric/FunctionSpace.h
-Partition.o: Partition.cpp
+Partition.o: Partition.cpp ../Geo/GModel.h ../Geo/GVertex.h \
+ ../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \
+ ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Geo/GPoint.h \
+ ../Geo/SPoint2.h ../Geo/GEdge.h ../Geo/GEntity.h ../Geo/GVertex.h \
+ ../Geo/SVector3.h ../Geo/SPoint3.h ../Geo/SPoint3.h ../Geo/SPoint2.h \
+ ../Geo/GFace.h ../Geo/GEntity.h ../Geo/GPoint.h ../Geo/GEdgeLoop.h \
+ ../Geo/GEdge.h ../Geo/SPoint2.h ../Geo/SVector3.h ../Geo/Pair.h \
+ ../Geo/GRegion.h ../Geo/GEntity.h ../Geo/SPoint3.h \
+ ../Geo/SBoundingBox3d.h Partition.h PartitionObjects.h \
+ ../Geo/MElement.h ../Common/GmshDefines.h ../Geo/MVertex.h \
+ ../Geo/SPoint3.h ../Geo/MEdge.h ../Geo/MVertex.h ../Geo/SVector3.h \
+ ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h ../Common/Message.h \
+ PartitionOptions.h
diff --git a/Mesh/PartitionObjects.h b/Mesh/PartitionObjects.h
index 23de9333e9..d461ec91dd 100644
--- a/Mesh/PartitionObjects.h
+++ b/Mesh/PartitionObjects.h
@@ -35,7 +35,7 @@ class GrVertex
GrVertex(const int _index, const unsigned short _size)
: index(_index), size(0), sizeC(_size)
{ }
- int add(const int v) { grEdge[size++] = v; }
+ void add(const int v) { grEdge[size++] = v; }
unsigned write(std::vector<int> &vec) const
{
switch(size) {
--
GitLab