From 73faa2779dd460f62af62028c18fe4297af3d5f2 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Wed, 22 Dec 2004 17:49:27 +0000
Subject: [PATCH] fixed "gcc -pedantic" warnings
---
Common/Visibility.cpp | 6 +++---
Numeric/EigSolve.cpp | 4 ++--
Plugin/Gradient.cpp | 6 +++---
Plugin/ShapeFunctions.h | 1 +
4 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/Common/Visibility.cpp b/Common/Visibility.cpp
index 5030cbab69..924f527909 100644
--- a/Common/Visibility.cpp
+++ b/Common/Visibility.cpp
@@ -1,4 +1,4 @@
-// $Id: Visibility.cpp,v 1.9 2004-12-21 20:23:15 geuzaine Exp $
+// $Id: Visibility.cpp,v 1.10 2004-12-22 17:49:26 geuzaine Exp $
//
// Copyright (C) 1997-2004 C. Geuzaine, J.-F. Remacle
//
@@ -628,8 +628,8 @@ void SetVisibilityByNumber(int num, int type, int mode)
List_Delete(tmp);
if(found)
break;
- // in volumes (this tricky, since V->Simplexes contains the
- // simplxes ordered by qualityad not by number; so we use the
+ // in volumes (this is tricky, since V->Simplexes contains the
+ // simplexes ordered by quality and not by number; so we use the
// global tree of simplexes here)
if((pS = (Simplex **) Tree_PQuery(THEM->Simplexes, &S))) {
(*pS)->Visible = mode;
diff --git a/Numeric/EigSolve.cpp b/Numeric/EigSolve.cpp
index 76ecc0ddf3..5395862109 100644
--- a/Numeric/EigSolve.cpp
+++ b/Numeric/EigSolve.cpp
@@ -1,4 +1,4 @@
-// $Id: EigSolve.cpp,v 1.3 2004-12-14 20:05:43 geuzaine Exp $
+// $Id: EigSolve.cpp,v 1.4 2004-12-22 17:49:26 geuzaine Exp $
//
// Copyright (C) 1997-2004 C. Geuzaine, J.-F. Remacle
//
@@ -706,7 +706,7 @@ int EigSolveSym(int n,int nm,double *A,double *d,double *V,
{
static const int NSWMAX = 50;
- int i,j,k,ii,ij,ik,ki=0,kj=0,kki,kkj,ival,jval;
+ int i,j,k,ii,ij,ki=0,kj=0,kki,kkj,ival,jval;
int nrot,nsweep;
double c,g,h,s,t,tau,theta,tresh,sum;
diff --git a/Plugin/Gradient.cpp b/Plugin/Gradient.cpp
index 43fef86084..422f62fb31 100644
--- a/Plugin/Gradient.cpp
+++ b/Plugin/Gradient.cpp
@@ -1,4 +1,4 @@
-// $Id: Gradient.cpp,v 1.2 2004-11-26 16:16:39 geuzaine Exp $
+// $Id: Gradient.cpp,v 1.3 2004-12-22 17:49:27 geuzaine Exp $
//
// Copyright (C) 1997-2004 C. Geuzaine, J.-F. Remacle
//
@@ -96,8 +96,8 @@ static void computeGradient(List_T *inList, int inNb,
outNb = outNbVector;
outList = outListVector;
- int MAX_NOD = 4;
- int MAX_COMP= 3;
+ const int MAX_NOD = 4;
+ const int MAX_COMP= 3;
int nb = List_Nbr(inList) / inNb;
diff --git a/Plugin/ShapeFunctions.h b/Plugin/ShapeFunctions.h
index cf47e7c560..43f8c4689a 100644
--- a/Plugin/ShapeFunctions.h
+++ b/Plugin/ShapeFunctions.h
@@ -78,6 +78,7 @@ public:
// non-singular jacobians, so that we can simply invert them with
// inv3x3
Msg(GERROR, "getInverseJacibian not done yet");
+ return 0.;
}
double interpolate(double val[], double u, double v, double w, int stride=1)
{
--
GitLab