From 07b32d835abcb329ed315c78e725caff4f810ae1 Mon Sep 17 00:00:00 2001 From: Christophe Geuzaine <cgeuzaine@ulg.ac.be> Date: Sun, 15 Jan 2006 19:28:26 +0000 Subject: [PATCH] fixes for gcc 2.95 --- Mesh/3D_Mesh_Tetgen.cpp | 6 +++--- Mesh/BDS.h | 1 + contrib/NR/nrutil.h | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Mesh/3D_Mesh_Tetgen.cpp b/Mesh/3D_Mesh_Tetgen.cpp index 2ff9102a36..8cde1cb44b 100644 --- a/Mesh/3D_Mesh_Tetgen.cpp +++ b/Mesh/3D_Mesh_Tetgen.cpp @@ -1,4 +1,4 @@ -// $Id: 3D_Mesh_Tetgen.cpp,v 1.4 2006-01-06 00:34:26 geuzaine Exp $ +// $Id: 3D_Mesh_Tetgen.cpp,v 1.5 2006-01-15 19:28:26 geuzaine Exp $ // // Copyright (C) 1997-2006 C. Geuzaine, J.-F. Remacle // @@ -129,8 +129,8 @@ int Mesh_Tetgen(Volume * vol) { in.facetmarkerlist[i] = s->iEnt; } - snprintf(opts, 128, "pqa%f%c", (float)CTX.mesh.quality, - (CTX.verbosity < 3)? 'Q': (CTX.verbosity > 6)? 'V': '\0'); + sprintf(opts, "pqa%f%c", (float)CTX.mesh.quality, + (CTX.verbosity < 3)? 'Q': (CTX.verbosity > 6)? 'V': '\0'); Msg(STATUS3, "Meshing with volume constraint %f", (float)CTX.mesh.quality); tetrahedralize(opts, &in, &out); diff --git a/Mesh/BDS.h b/Mesh/BDS.h index c3b957cc32..7eb0383f78 100644 --- a/Mesh/BDS.h +++ b/Mesh/BDS.h @@ -29,6 +29,7 @@ #include <set> #include <map> #include <vector> +#include <algorithm> #include <list> #include <math.h> diff --git a/contrib/NR/nrutil.h b/contrib/NR/nrutil.h index 436193de5e..4b27753785 100644 --- a/contrib/NR/nrutil.h +++ b/contrib/NR/nrutil.h @@ -52,7 +52,7 @@ static int iminarg1,iminarg2; #if defined(__STDC__) || defined(ANSI) || defined(NRANSI) /* ANSI */ void nrerror(char error_text[]); -float *vector(long nl, long nh); +//float *vector(long nl, long nh); int *ivector(long nl, long nh); unsigned char *cvector(long nl, long nh); unsigned long *lvector(long nl, long nh); -- GitLab