From 6f9b9b624524e860edae329bd7e58596b21e9e61 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Fri, 21 Mar 2008 18:27:39 +0000
Subject: [PATCH] fix compile with gcc4.3
---
Fltk/Callbacks.cpp | 4 ++--
Fltk/GUI.cpp | 3 ++-
Geo/gmshSurface.cpp | 4 ++--
Geo/gmshSurface.h | 4 ++--
Mesh/Field.h | 1 +
Plugin/GSHHS.cpp | 6 +++---
Post/PViewDataGModel.h | 9 ++++-----
Post/PViewDataGModelIO.cpp | 6 +++---
8 files changed, 19 insertions(+), 18 deletions(-)
diff --git a/Fltk/Callbacks.cpp b/Fltk/Callbacks.cpp
index 60ad1ba975..e7ce1930f3 100644
--- a/Fltk/Callbacks.cpp
+++ b/Fltk/Callbacks.cpp
@@ -1,4 +1,4 @@
-// $Id: Callbacks.cpp,v 1.571 2008-03-21 07:21:04 geuzaine Exp $
+// $Id: Callbacks.cpp,v 1.572 2008-03-21 18:27:38 geuzaine Exp $
//
// Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
//
@@ -4604,7 +4604,7 @@ void view_field_select_node_cb(CALLBACK_ARGS)
printf("char = %c\n", ib);
if(ib == 'q'){
for(std::vector<GVertex*>::iterator it = vertices.begin(); it != vertices.end(); it++){
- printf("%i\n", *it);
+ printf("%p\n", *it);
}
break;
}
diff --git a/Fltk/GUI.cpp b/Fltk/GUI.cpp
index a454f18690..eac905f68a 100644
--- a/Fltk/GUI.cpp
+++ b/Fltk/GUI.cpp
@@ -1,4 +1,4 @@
-// $Id: GUI.cpp,v 1.667 2008-03-21 07:26:03 geuzaine Exp $
+// $Id: GUI.cpp,v 1.668 2008-03-21 18:27:38 geuzaine Exp $
//
// Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
//
@@ -3947,6 +3947,7 @@ FieldDialogBox::FieldDialogBox(Field *f, int x, int y, int width, int height,int
input=new Fl_Input(x+WB,yy,IW,BH,it->first);
break;
case FIELD_OPTION_LIST:
+ default:
/*{
Fl_Button *b=new Fl_Button(x+WB,yy,BH,BH);
b->label("@+");
diff --git a/Geo/gmshSurface.cpp b/Geo/gmshSurface.cpp
index ad078bb8b8..a05636db3e 100644
--- a/Geo/gmshSurface.cpp
+++ b/Geo/gmshSurface.cpp
@@ -1,4 +1,4 @@
-// $Id: gmshSurface.cpp,v 1.13 2008-03-20 11:44:07 geuzaine Exp $
+// $Id: gmshSurface.cpp,v 1.14 2008-03-21 18:27:38 geuzaine Exp $
//
// Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
//
@@ -125,7 +125,7 @@ SPoint3 gmshParametricSurface::point(double par1, double par2) const
return SPoint3(0.,0.,0.);
#else
char *names[2] = {"u", "v"};
- double values [2] = {par1,par2};
+ double values [2] = {par1, par2};
const double x = evaluator_evaluate(evalX, 2, names, values);
const double y = evaluator_evaluate(evalY, 2, names, values);
const double z = evaluator_evaluate(evalZ, 2, names, values);
diff --git a/Geo/gmshSurface.h b/Geo/gmshSurface.h
index b3857681c1..a9e451360b 100644
--- a/Geo/gmshSurface.h
+++ b/Geo/gmshSurface.h
@@ -106,8 +106,8 @@ public:
class gmshPolarSphere : public gmshSurface
{
double r;
- SPoint3 o;
- gmshPolarSphere(double x, double y, double z, double _r) : o(x,y,z), r(_r){}
+ SPoint3 o;
+ gmshPolarSphere(double x, double y, double z, double _r) : r(_r), o(x,y,z) {}
public:
static gmshSurface *NewPolarSphere(int _iSphere, double _x, double _y, double _z, double _r);
virtual Range<double> parBounds(int i) const
diff --git a/Mesh/Field.h b/Mesh/Field.h
index 37131ea36c..f2e6ae3487 100644
--- a/Mesh/Field.h
+++ b/Mesh/Field.h
@@ -22,6 +22,7 @@
#include <map>
#include <list>
+#include <string.h>
#include "Geo.h"
#include "PView.h"
diff --git a/Plugin/GSHHS.cpp b/Plugin/GSHHS.cpp
index 7d0b5e4127..468cb2118d 100644
--- a/Plugin/GSHHS.cpp
+++ b/Plugin/GSHHS.cpp
@@ -1,4 +1,4 @@
-// $Id: GSHHS.cpp,v 1.4 2008-03-20 11:44:13 geuzaine Exp $
+// $Id: GSHHS.cpp,v 1.5 2008-03-21 18:27:38 geuzaine Exp $
//
// Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
//
@@ -30,7 +30,7 @@
extern Context_T CTX;
// ************** GSHHS **************
-/* $Id: GSHHS.cpp,v 1.4 2008-03-20 11:44:13 geuzaine Exp $
+/* $Id: GSHHS.cpp,v 1.5 2008-03-21 18:27:38 geuzaine Exp $
*
* PROGRAM: gshhs.c
* AUTHOR: Paul Wessel (pwessel@hawaii.edu)
@@ -93,7 +93,7 @@ void import_gshhs(FILE * fp, GeoEarthImport & geo_import)
{
double w, e, s, n;
char source;
- int k, max_east = 270000000, info, n_read, flip;
+ int k, max_east = 270000000, n_read, flip;
struct POINT p;
struct GSHHS h;
while(1) {
diff --git a/Post/PViewDataGModel.h b/Post/PViewDataGModel.h
index 7512ff133e..46fac88d78 100644
--- a/Post/PViewDataGModel.h
+++ b/Post/PViewDataGModel.h
@@ -58,9 +58,8 @@ class stepData{
stepData(GModel *model, DataType type, int numComp,
std::string fileName="", int fileIndex=-1, double time=0.,
double min=VAL_INF, double max=-VAL_INF)
- : _model(model), _type(type), _numComp(numComp),
- _fileName(fileName), _fileIndex(fileIndex),
- _time(time), _min(min), _max(max), _data(0)
+ : _model(model), _type(type), _fileName(fileName), _fileIndex(fileIndex),
+ _time(time), _min(min), _max(max), _numComp(numComp), _data(0)
{
// store vector of GEntities so we can index them efficiently
for(GModel::eiter it = _model->firstEdge(); it != _model->lastEdge(); ++it)
@@ -97,11 +96,11 @@ class stepData{
void resizeData(int n)
{
if(!_data) _data = new std::vector<real*>(n, (real*)0);
- if(n < _data->size()) _data->resize(n, (real*)0);
+ if(n < (int)_data->size()) _data->resize(n, (real*)0);
}
real *getData(int index, bool allocIfNeeded=false)
{
- if(!_data || index >= _data->size()) resizeData(index + 100); // optimize this
+ if(!_data || index >= (int)_data->size()) resizeData(index + 100); // optimize this
if(allocIfNeeded && !(*_data)[index]) (*_data)[index] = new real[_numComp];
return (*_data)[index];
}
diff --git a/Post/PViewDataGModelIO.cpp b/Post/PViewDataGModelIO.cpp
index 662e3b73e4..4fa6c93763 100644
--- a/Post/PViewDataGModelIO.cpp
+++ b/Post/PViewDataGModelIO.cpp
@@ -1,4 +1,4 @@
-// $Id: PViewDataGModelIO.cpp,v 1.11 2008-03-20 11:44:15 geuzaine Exp $
+// $Id: PViewDataGModelIO.cpp,v 1.12 2008-03-21 18:27:39 geuzaine Exp $
//
// Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
//
@@ -126,14 +126,14 @@ bool PViewDataGModel::writeMSH(std::string name, bool binary)
for(unsigned int step = 0; step < _steps.size(); step++){
int numNodes = 0, numComp = _steps[step]->getNumComp();
- for(unsigned int i = 0; i < _steps[step]->getNumData(); i++)
+ for(int i = 0; i < _steps[step]->getNumData(); i++)
if(_steps[step]->getData(i)) numNodes++;
if(numNodes){
fprintf(fp, "$NodeData\n");
fprintf(fp, "\"%s\"\n", getName().c_str());
fprintf(fp, "%d %.16g 0 0 %d %d\n", step, _steps[step]->getTime(),
numComp, numNodes);
- for(unsigned int i = 0; i < _steps[step]->getNumData(); i++){
+ for(int i = 0; i < _steps[step]->getNumData(); i++){
if(_steps[step]->getData(i)){
if(binary){
fwrite(&tags[i], sizeof(int), 1, fp);
--
GitLab