From 1b6a6cd4bb37a8a855a7ad9543bc6c46870ccbf1 Mon Sep 17 00:00:00 2001
From: Jean-Francois Remacle <jean-francois.remacle@uclouvain.be>
Date: Wed, 24 Aug 2005 20:28:43 +0000
Subject: [PATCH] *** empty log message ***

---
 ANN/include/ANN/ANN.h | 2 +-
 Common/Options.cpp    | 3 ++-
 Fltk/GUI.cpp          | 3 ++-
 Fltk/Main.cpp         | 6 ++++--
 Mesh/BDS.cpp          | 6 ++----
 Mesh/BDS.h            | 8 ++++----
 Plugin/Annotate.cpp   | 3 ++-
 7 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/ANN/include/ANN/ANN.h b/ANN/include/ANN/ANN.h
index c7d12fd6c0..ca8146a35a 100644
--- a/ANN/include/ANN/ANN.h
+++ b/ANN/include/ANN/ANN.h
@@ -60,7 +60,7 @@
 #ifndef ANN_H
 #define ANN_H
 
-#ifdef WIN32
+#ifdef WIN33
   //----------------------------------------------------------------------
   // For Microsoft Visual C++, externally accessible symbols must be
   // explicitly indicated with DLL_API, which is somewhat like "extern."
diff --git a/Common/Options.cpp b/Common/Options.cpp
index d21f6bf5f1..c5a8397b08 100644
--- a/Common/Options.cpp
+++ b/Common/Options.cpp
@@ -1,4 +1,4 @@
-// $Id: Options.cpp,v 1.254 2005-08-09 23:41:12 geuzaine Exp $
+// $Id: Options.cpp,v 1.255 2005-08-24 20:28:42 remacle Exp $
 //
 // Copyright (C) 1997-2005 C. Geuzaine, J.-F. Remacle
 //
@@ -20,6 +20,7 @@
 // Please report all bugs and problems to <gmsh@geuz.org>.
 
 #include <iostream>
+#include <vector>
 #include "PluginManager.h"
 #include "Gmsh.h"
 #include "GmshUI.h"
diff --git a/Fltk/GUI.cpp b/Fltk/GUI.cpp
index 5a447574b4..1f3b211aa6 100644
--- a/Fltk/GUI.cpp
+++ b/Fltk/GUI.cpp
@@ -1,4 +1,4 @@
-// $Id: GUI.cpp,v 1.454 2005-08-09 23:41:12 geuzaine Exp $
+// $Id: GUI.cpp,v 1.455 2005-08-24 20:28:42 remacle Exp $
 //
 // Copyright (C) 1997-2005 C. Geuzaine, J.-F. Remacle
 //
@@ -66,6 +66,7 @@
 // *INDENT-OFF*
 
 #include <iostream>
+#include <vector>
 #include "PluginManager.h"
 #include "Gmsh.h"
 #include "GmshUI.h"
diff --git a/Fltk/Main.cpp b/Fltk/Main.cpp
index b27793c550..f08e606359 100644
--- a/Fltk/Main.cpp
+++ b/Fltk/Main.cpp
@@ -1,4 +1,4 @@
-// $Id: Main.cpp,v 1.82 2005-08-09 23:41:13 geuzaine Exp $
+// $Id: Main.cpp,v 1.83 2005-08-24 20:28:43 remacle Exp $
 //
 // Copyright (C) 1997-2005 C. Geuzaine, J.-F. Remacle
 //
@@ -20,9 +20,12 @@
 // Please report all bugs and problems to <gmsh@geuz.org>.
 
 #include <iostream>
+#include <vector>
 #include <signal.h>
 #include <time.h>
 
+#include "GUI.h"
+
 #include "PluginManager.h"
 #include "Gmsh.h"
 #include "GmshUI.h"
@@ -35,7 +38,6 @@
 #include "Options.h"
 #include "ColorTable.h"
 #include "Parser.h"
-#include "GUI.h"
 #include "OpenFile.h"
 #include "CommandLine.h"
 #include "Numeric.h"
diff --git a/Mesh/BDS.cpp b/Mesh/BDS.cpp
index f70d2e573c..6834ee34bd 100644
--- a/Mesh/BDS.cpp
+++ b/Mesh/BDS.cpp
@@ -1,10 +1,8 @@
-#include "BDS.h"
-#include <map>
 #include <math.h>
 #include <stdio.h>
 #include "Numeric.h"
 #include "GmshMatrix.h"
-#include "EigSolve.h"
+#include "BDS.h"
 
 /*
   (X-Xc)^2 = R^2
@@ -2410,7 +2408,7 @@ int BDS_Mesh :: adapt_mesh ( double l, bool smooth, BDS_Mesh *geom_mesh)
     }
     
     printf("%d snaps have succeeded , %d have failed\n",SNAP_SUCCESS,SNAP_FAILURE);
-    outputScalarField (triangles,"b.pos");
+    //    outputScalarField (triangles,"b.pos");
     return nb_modif;
 }
 
diff --git a/Mesh/BDS.h b/Mesh/BDS.h
index 5e17455aa5..dae0541d3e 100644
--- a/Mesh/BDS.h
+++ b/Mesh/BDS.h
@@ -3,16 +3,16 @@
 // points may know the normals to the surface they are classified on
 // default values are 0,0,1
 
+#ifdef HAVE_ANN_
+#include "ANN/ANN.h"
+#endif
 #include <string>
 #include <set>
 #include <map>
 #include <vector>
 #include <list>
 #include <math.h>
-#include <algorithm>
-#ifdef HAVE_ANN_
-#include "ANN/ANN.h"
-#endif
+//#include <algorithm>
 
 class BDS_Edge;
 class BDS_Triangle;
diff --git a/Plugin/Annotate.cpp b/Plugin/Annotate.cpp
index 58c46ce830..aea6122d24 100644
--- a/Plugin/Annotate.cpp
+++ b/Plugin/Annotate.cpp
@@ -1,4 +1,4 @@
-// $Id: Annotate.cpp,v 1.12 2005-08-04 14:04:08 colignon Exp $
+// $Id: Annotate.cpp,v 1.13 2005-08-24 20:28:43 remacle Exp $
 //
 // Copyright (C) 1997-2005 C. Geuzaine, J.-F. Remacle
 //
@@ -20,6 +20,7 @@
 // Please report all bugs and problems to <gmsh@geuz.org>.
 
 #include <iostream>
+#include <vector>
 #include "Plugin.h"
 #include "Annotate.h"
 #include "List.h"
-- 
GitLab