compile fixes from Christophe Trophime

utils/api_demos/mainAntTweakBar.cpp

@@ -3,6 +3,7 @@
 // and libAntTweakBar
 //
 
+#include <cstring>
 #if defined(__APPLE__)
 #  include <GLUT/glut.h>
 #else

utils/api_demos/mainCartesian.cpp

@@ -12,7 +12,7 @@
 #include "GmshMessage.h"
 #include "cartesian.h"
 
-void insertActiveCells(double x, double y, double z, double rmax,
+static void insertActiveCells(double x, double y, double z, double rmax,
                               cartesianBox<double> &box)
 {
   int id1 = box.getCellContainingPoint(x - rmax, y - rmax, z - rmax);
@@ -27,7 +27,7 @@ void insertActiveCells(double x, double y, double z, double rmax,
         box.insertActiveCell(box.getCellIndex(i, j, k));
 }
 
-void computeLevelset(GModel *gm, cartesianBox<double> &box)
+static void computeLevelset(GModel *gm, cartesianBox<double> &box)
 {
   // tolerance for desambiguation
   const double tol = box.getLC() * 1.e-12;
@@ -85,7 +85,7 @@ void computeLevelset(GModel *gm, cartesianBox<double> &box)
   if(box.getChildBox()) computeLevelset(gm, *box.getChildBox());
 }
 
-void fillPointCloud(GEdge *ge, double sampling, std::vector<SPoint3> &points)
+static void fillPointCloud(GEdge *ge, double sampling, std::vector<SPoint3> &points)
 {
   Range<double> t_bounds = ge->parBounds(0);
   double t_min = t_bounds.low();
@@ -99,7 +99,7 @@ void fillPointCloud(GEdge *ge, double sampling, std::vector<SPoint3> &points)
   }
 }
 
-int removeBadChildCells(cartesianBox<double> *parent)
+static int removeBadChildCells(cartesianBox<double> *parent)
 {
   cartesianBox<double> *child = parent->getChildBox();
   if(!child) return 0;
@@ -138,7 +138,7 @@ int removeBadChildCells(cartesianBox<double> *parent)
   return removeBadChildCells(child);
 }
 
-void removeParentCellsWithChildren(cartesianBox<double> *box)
+static void removeParentCellsWithChildren(cartesianBox<double> *box)
 {
   if(!box->getChildBox()) return;
   for(int i = 0; i < box->getNxi(); i++)
@@ -160,7 +160,7 @@ void removeParentCellsWithChildren(cartesianBox<double> *box)
   removeParentCellsWithChildren(box->getChildBox());
 }
 
-void removeOutsideCells(cartesianBox<double> *box)
+static void removeOutsideCells(cartesianBox<double> *box)
 {
   if(!box) return;
   int nbErased = 0;

utils/api_demos/mainElasticity.cpp

+#include <cstring>
 #include "Gmsh.h"
 #include "elasticitySolver.h"
 #include "PView.h"

utils/api_demos/mainGlut.cpp

@@ -69,7 +69,7 @@ void display()
 
     glMatrixMode(GL_PROJECTION);
     glLoadIdentity();
-    glFrustum(camera->glFleft,camera->glFright,camera->glFbottom,camera->glFtop,camera->near,camera->far); 
+    glFrustum(camera->glFleft,camera->glFright,camera->glFbottom,camera->glFtop,camera->glFnear,camera->glFfar);
     glMatrixMode(GL_MODELVIEW);
     glDrawBuffer(GL_BACK);
     glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
@@ -97,7 +97,7 @@ void display()
     double right =   camera->screenratio * camera->wd2 - 0.5 * camera->eyesep * camera->ndfl;
     double top    =   camera->wd2;
     double  bottom = - camera->wd2;
-    glFrustum(left,right,bottom,top,camera->near,camera->far);
+    glFrustum(left,right,bottom,top,camera->glFnear,camera->glFfar);
     glMatrixMode(GL_MODELVIEW);
     glDrawBuffer(GL_BACK_RIGHT);
     glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
@@ -115,7 +115,7 @@ void display()
     right =   camera->screenratio * camera->wd2 + 0.5 * camera->eyesep * camera->ndfl;
     top    =   camera->wd2;
     bottom = - camera->wd2;
-    glFrustum(left,right,bottom,top,camera->near,camera->far);
+    glFrustum(left,right,bottom,top,camera->glFnear,camera->glFfar);
 
     glMatrixMode(GL_MODELVIEW);
     glDrawBuffer(GL_BACK_LEFT);

utils/api_demos/mainHomology.cpp

@@ -36,7 +36,7 @@ int main(int argc, char **argv)
   homology->setFileName("homology.msh");
 
   // construct cell complex of the meshed domain
-  CellComplex cc = homology->createCellComplex();
+  CellComplex *cc = homology->createCellComplex();
 
   // find homology basis elements
   homology->findHomologyBasis(cc);