From 451fbe5a1b39d420f40f212585c20a09643cf763 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Tue, 2 Dec 2008 07:08:08 +0000
Subject: [PATCH] compile fix
---
Fltk/GUI.h | 2 +-
Fltk/graphicWindow.cpp | 1 +
Fltk/messageWindow.cpp | 1 +
Fltk/visibilityWindow.cpp | 21 +++++++++++----------
Graphics/drawAxes.cpp | 1 +
5 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/Fltk/GUI.h b/Fltk/GUI.h
index 5e67852a33..5abcdd34d3 100644
--- a/Fltk/GUI.h
+++ b/Fltk/GUI.h
@@ -62,7 +62,7 @@ class GUI{
// return the single static instance of the GUI
static GUI *instance(int argc=0, char **argv=0);
// check if the GUI is available
- static bool GUI::available(){ return (_instance != 0); }
+ static bool available(){ return (_instance != 0); }
// run the GUI until there's no window left
int run(){ return Fl::run(); }
// check (now!) if there are any pending events, and process them
diff --git a/Fltk/graphicWindow.cpp b/Fltk/graphicWindow.cpp
index 686669215b..8eaf7fbd4f 100644
--- a/Fltk/graphicWindow.cpp
+++ b/Fltk/graphicWindow.cpp
@@ -3,6 +3,7 @@
// See the LICENSE.txt file for license information. Please report all
// bugs and problems to <gmsh@geuz.org>.
+#include <string.h>
#include <FL/fl_draw.H>
#include "GUI.h"
#include "graphicWindow.h"
diff --git a/Fltk/messageWindow.cpp b/Fltk/messageWindow.cpp
index 7c387e064a..5da90d3f19 100644
--- a/Fltk/messageWindow.cpp
+++ b/Fltk/messageWindow.cpp
@@ -3,6 +3,7 @@
// See the LICENSE.txt file for license information. Please report all
// bugs and problems to <gmsh@geuz.org>.
+#include <string.h>
#include <FL/Fl_Box.H>
#include <FL/Fl_Return_Button.H>
#include <FL/fl_ask.H>
diff --git a/Fltk/visibilityWindow.cpp b/Fltk/visibilityWindow.cpp
index 74e52858c6..3abfd9b4e1 100644
--- a/Fltk/visibilityWindow.cpp
+++ b/Fltk/visibilityWindow.cpp
@@ -3,6 +3,7 @@
// See the LICENSE.txt file for license information. Please report all
// bugs and problems to <gmsh@geuz.org>.
+#include <string.h>
#include <FL/Fl_Tabs.H>
#include <FL/Fl_Box.H>
#include <FL/Fl_Return_Button.H>
@@ -13,7 +14,7 @@
#include "contextWindow.h"
#include "GmshDefines.h"
#include "GmshMessage.h"
-#include "GModel.h"'
+#include "GModel.h"
#include "MElement.h"
#include "Visibility.h"
#include "SelectBuffer.h"
@@ -209,12 +210,12 @@ static void visibility_number_cb(Fl_Widget *w, void *data)
Draw();
}
-static void _apply_visibility(char mode,
- std::vector<GVertex*> &vertices,
- std::vector<GEdge*> &edges,
- std::vector<GFace*> &faces,
- std::vector<GRegion*> ®ions,
- std::vector<MElement*> &elements)
+static void apply_visibility(char mode,
+ std::vector<GVertex*> &vertices,
+ std::vector<GEdge*> &edges,
+ std::vector<GFace*> &faces,
+ std::vector<GRegion*> ®ions,
+ std::vector<MElement*> &elements)
{
// type = 0 for elementary, 1 for physical and 2 for partitions
int type = GUI::instance()->visibility->type->value();
@@ -378,7 +379,7 @@ static void visibility_interactive_cb(Fl_Widget *w, void *data)
char ib = SelectEntity(what, vertices, edges, faces, regions, elements);
if(ib == 'l') {
- _apply_visibility(mode, vertices, edges, faces, regions, elements);
+ apply_visibility(mode, vertices, edges, faces, regions, elements);
// store for possible undo later
vertices_old = vertices;
edges_old = edges;
@@ -387,8 +388,8 @@ static void visibility_interactive_cb(Fl_Widget *w, void *data)
elements_old = elements;
}
if(ib == 'u' && !mode){ // undo only in hide mode
- _apply_visibility(2, vertices_old, edges_old, faces_old,
- regions_old, elements_old);
+ apply_visibility(2, vertices_old, edges_old, faces_old,
+ regions_old, elements_old);
}
if(ib == 'q'){
break;
diff --git a/Graphics/drawAxes.cpp b/Graphics/drawAxes.cpp
index 09073317bd..6937c83488 100644
--- a/Graphics/drawAxes.cpp
+++ b/Graphics/drawAxes.cpp
@@ -3,6 +3,7 @@
// See the LICENSE.txt file for license information. Please report all
// bugs and problems to <gmsh@geuz.org>.
+#include <string.h>
#include <FL/gl.h>
#include "drawContext.h"
#include "Draw.h"
--
GitLab