From 9b2068d739ec84ed61e9ceec0ee4290da0edc47e Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Fri, 14 Nov 2008 17:55:18 +0000
Subject: [PATCH] Message->GmshMessage to avoid conflicts with third party
codes (too common)
---
Common/CommandLine.cpp | 2 +-
Common/CreateFile.cpp | 2 +-
Common/Gmsh.cpp | 2 +-
Common/Gmsh.h | 8 +-
Common/GmshDaemon.cpp | 2 +-
Common/{Message.cpp => GmshMessage.cpp} | 92 +++++++-------
Common/{Message.h => GmshMessage.h} | 18 +--
Common/ListUtils.cpp | 2 +-
Common/Main.cpp | 2 +-
Common/Makefile | 52 ++++----
Common/MallocUtils.cpp | 2 +-
Common/OS.cpp | 2 +-
Common/OctreeInternals.cpp | 2 +-
Common/OpenFile.cpp | 2 +-
Common/Options.cpp | 2 +-
Fltk/Callbacks.cpp | 2 +-
Fltk/GUI.cpp | 2 +-
Fltk/GUI_Classifier.cpp | 2 +-
Fltk/GUI_Projection.cpp | 2 +-
Fltk/Main.cpp | 2 +-
Fltk/Makefile | 69 +++++-----
Fltk/Opengl_Window.cpp | 2 +-
Fltk/Solvers.cpp | 2 +-
Geo/CustomContainer.h | 2 +-
Geo/ExtrudeParams.cpp | 2 +-
Geo/GEdge.cpp | 2 +-
Geo/GEdgeLoop.cpp | 2 +-
Geo/GFace.cpp | 2 +-
Geo/GModel.cpp | 2 +-
Geo/GModelIO_CGNS.cpp | 2 +-
Geo/GModelIO_Fourier.cpp | 2 +-
Geo/GModelIO_Geo.cpp | 2 +-
Geo/GModelIO_MED.cpp | 2 +-
Geo/GModelIO_Mesh.cpp | 2 +-
Geo/GModelIO_OCC.cpp | 2 +-
Geo/GRegion.cpp | 2 +-
Geo/GVertex.cpp | 2 +-
Geo/Geo.cpp | 2 +-
Geo/GeoInterpolation.cpp | 2 +-
Geo/GeoStringInterface.cpp | 2 +-
Geo/MElement.cpp | 2 +-
Geo/MElement.h | 2 +-
Geo/MVertex.cpp | 2 +-
Geo/MZoneBoundary.cpp | 2 +-
Geo/Makefile | 104 +++++++--------
Geo/OCCEdge.cpp | 2 +-
Geo/OCCFace.cpp | 2 +-
Geo/OCCRegion.cpp | 2 +-
Geo/discreteEdge.cpp | 2 +-
Geo/discreteFace.cpp | 2 +-
Geo/findLinks.cpp | 2 +-
Geo/fourierFace.cpp | 2 +-
Geo/gmshEdge.cpp | 2 +-
Geo/gmshFace.cpp | 2 +-
Geo/gmshRegion.cpp | 2 +-
Geo/gmshSurface.cpp | 2 +-
Geo/gmshVertex.cpp | 2 +-
Graphics/Draw.cpp | 2 +-
Graphics/Makefile | 48 +++----
Graphics/Mesh.cpp | 2 +-
Graphics/PixelBuffer.h | 2 +-
Graphics/Post.cpp | 2 +-
Graphics/ReadImg.cpp | 2 +-
Graphics/SelectBuffer.cpp | 2 +-
Makefile | 7 +-
Mesh/BDS.cpp | 2 +-
Mesh/BDS.h | 2 +-
Mesh/BackgroundMesh.cpp | 2 +-
Mesh/BoundaryLayers.cpp | 2 +-
Mesh/DivideAndConquer.cpp | 2 +-
Mesh/Field.cpp | 2 +-
Mesh/Generator.cpp | 2 +-
Mesh/HighOrder.cpp | 2 +-
Mesh/Makefile | 161 +++++++++++++-----------
Mesh/PartitionObjects.h | 2 +-
Mesh/meshGEdge.cpp | 2 +-
Mesh/meshGEdgeExtruded.cpp | 2 +-
Mesh/meshGFace.cpp | 2 +-
Mesh/meshGFaceBDS.cpp | 2 +-
Mesh/meshGFaceDelaunayInsertion.cpp | 2 +-
Mesh/meshGFaceExtruded.cpp | 2 +-
Mesh/meshGFaceOptimize.cpp | 2 +-
Mesh/meshGFaceQuadrilateralize.cpp | 2 +-
Mesh/meshGFaceTransfinite.cpp | 2 +-
Mesh/meshGRegion.cpp | 2 +-
Mesh/meshGRegionCarveHole.cpp | 2 +-
Mesh/meshGRegionDelaunayInsertion.cpp | 2 +-
Mesh/meshGRegionExtruded.cpp | 2 +-
Mesh/meshGRegionLocalMeshMod.cpp | 2 +-
Mesh/meshGRegionTransfinite.cpp | 2 +-
Mesh/qualityMeasures.cpp | 2 +-
Numeric/FunctionSpace.cpp | 2 +-
Numeric/Makefile | 52 ++++----
Numeric/Numeric.cpp | 2 +-
Numeric/NumericEmbedded.cpp | 2 +-
Numeric/gmshLinearSystemGmm.h | 2 +-
Numeric/gsl_brent.cpp | 2 +-
Numeric/gsl_min.cpp | 2 +-
Numeric/gsl_newt.cpp | 2 +-
Parser/Gmsh.tab.cpp | 2 +-
Parser/Gmsh.yy.cpp | 2 +-
Parser/Makefile | 4 +-
Plugin/Makefile | 70 +++++------
Plugin/Plugin.h | 2 +-
Plugin/Triangulate.cpp | 2 +-
Post/ColorTable.cpp | 2 +-
Post/Makefile | 32 ++---
Post/OctreePost.cpp | 2 +-
Post/PView.cpp | 2 +-
Post/PViewData.cpp | 2 +-
Post/PViewDataGModel.cpp | 2 +-
Post/PViewDataGModelIO.cpp | 2 +-
Post/PViewDataIO.cpp | 2 +-
Post/PViewDataList.cpp | 2 +-
Post/PViewDataListIO.cpp | 2 +-
Post/PViewIO.cpp | 2 +-
Post/PViewOptions.cpp | 2 +-
Post/shapeFunctions.h | 2 +-
contrib/Chaco/main/Gmsh_printf.cpp | 2 +-
contrib/NR/nrutil.cpp | 2 +-
contrib/Netgen/nglib_addon.cpp | 2 +-
doc/TODO.txt | 9 +-
122 files changed, 481 insertions(+), 461 deletions(-)
rename Common/{Message.cpp => GmshMessage.cpp} (87%)
rename Common/{Message.h => GmshMessage.h} (90%)
diff --git a/Common/CommandLine.cpp b/Common/CommandLine.cpp
index 093c38cd58..db259b54db 100644
--- a/Common/CommandLine.cpp
+++ b/Common/CommandLine.cpp
@@ -9,7 +9,7 @@
#include "GmshUI.h"
#include "GmshDefines.h"
#include "GmshVersion.h"
-#include "Message.h"
+#include "GmshMessage.h"
#include "OpenFile.h"
#include "CommandLine.h"
#include "Context.h"
diff --git a/Common/CreateFile.cpp b/Common/CreateFile.cpp
index b3f97f4ed3..db2590239c 100644
--- a/Common/CreateFile.cpp
+++ b/Common/CreateFile.cpp
@@ -4,7 +4,7 @@
// bugs and problems to <gmsh@geuz.org>.
#include <string.h>
-#include "Message.h"
+#include "GmshMessage.h"
#include "GModel.h"
#include "GmshDefines.h"
#include "StringUtils.h"
diff --git a/Common/Gmsh.cpp b/Common/Gmsh.cpp
index d782118fe7..a8b927366c 100644
--- a/Common/Gmsh.cpp
+++ b/Common/Gmsh.cpp
@@ -6,7 +6,7 @@
#include <string>
#include "GmshDefines.h"
#include "GModel.h"
-#include "Message.h"
+#include "GmshMessage.h"
#include "OpenFile.h"
#include "CreateFile.h"
#include "Options.h"
diff --git a/Common/Gmsh.h b/Common/Gmsh.h
index c0d135ea04..40acf67358 100644
--- a/Common/Gmsh.h
+++ b/Common/Gmsh.h
@@ -7,13 +7,7 @@
#define _GMSH_H_
#include <string>
-
-class GmshMessage{
- public:
- GmshMessage(){}
- virtual ~GmshMessage(){}
- virtual void operator()(std::string level, std::string message){}
-};
+#include "GmshMessage.h"
int GmshInitialize(int argc=0, char **argv=0);
int GmshSetMessageHandler(GmshMessage *callback);
diff --git a/Common/GmshDaemon.cpp b/Common/GmshDaemon.cpp
index 051893543e..0836193ed2 100644
--- a/Common/GmshDaemon.cpp
+++ b/Common/GmshDaemon.cpp
@@ -4,7 +4,7 @@
// bugs and problems to <gmsh@geuz.org>.
#include <sstream>
-#include "Message.h"
+#include "GmshMessage.h"
#include "OS.h"
#include "GmshSocket.h"
diff --git a/Common/Message.cpp b/Common/GmshMessage.cpp
similarity index 87%
rename from Common/Message.cpp
rename to Common/GmshMessage.cpp
index c564c6899b..7829f2f982 100644
--- a/Common/Message.cpp
+++ b/Common/GmshMessage.cpp
@@ -6,7 +6,7 @@
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
-#include "Message.h"
+#include "GmshMessage.h"
#include "Gmsh.h"
#include "Options.h"
#include "Context.h"
@@ -22,23 +22,17 @@
extern GUI *WID;
#endif
-#ifdef _MSC_VER
- #if(_MSC_VER==1310)//NET 2003
- #define vsnprintf _vsnprintf
- #endif
-#endif
-
extern Context_T CTX;
-int Message::_commRank = 0;
-int Message::_commSize = 1;
-int Message::_verbosity = 4;
-int Message::_progressMeterStep = 10;
-int Message::_progressMeterCurrent = 0;
-std::map<std::string, double> Message::_timers;
-int Message::_warningCount = 0;
-int Message::_errorCount = 0;
-GmshMessage *Message::_callback = 0;
+int Msg::_commRank = 0;
+int Msg::_commSize = 1;
+int Msg::_verbosity = 4;
+int Msg::_progressMeterStep = 10;
+int Msg::_progressMeterCurrent = 0;
+std::map<std::string, double> Msg::_timers;
+int Msg::_warningCount = 0;
+int Msg::_errorCount = 0;
+GmshMessage *Msg::_callback = 0;
#if defined(HAVE_NO_VSNPRINTF)
static int vsnprintf(char *str, size_t size, const char *fmt, va_list ap)
@@ -52,7 +46,11 @@ static int vsnprintf(char *str, size_t size, const char *fmt, va_list ap)
}
#endif
-void Message::Init(int argc, char **argv)
+#if defined(_MSC_VER) && (_MSC_VER == 1310) //NET 2003
+#define vsnprintf _vsnprintf
+#endif
+
+void Msg::Init(int argc, char **argv)
{
#if defined(HAVE_MPI)
MPI_Init(&argc, &argv);
@@ -62,7 +60,7 @@ void Message::Init(int argc, char **argv)
#endif
}
-void Message::Exit(int level)
+void Msg::Exit(int level)
{
// delete the temp file
if(!_commRank) UnlinkFile(CTX.tmp_filename_fullpath);
@@ -77,7 +75,7 @@ void Message::Exit(int level)
#endif
exit(level);
}
-
+
#if defined(HAVE_FLTK)
// if we exit cleanly (level==0) and we are in full GUI mode, save
// the persistent info to disk
@@ -128,7 +126,7 @@ void Message::Exit(int level)
exit(0);
}
-void Message::Fatal(const char *fmt, ...)
+void Msg::Fatal(const char *fmt, ...)
{
_errorCount++;
@@ -163,7 +161,7 @@ void Message::Fatal(const char *fmt, ...)
if(!_callback) Exit(1);
}
-void Message::Error(const char *fmt, ...)
+void Msg::Error(const char *fmt, ...)
{
_errorCount++;
@@ -187,7 +185,7 @@ void Message::Error(const char *fmt, ...)
#endif
if(CTX.terminal){
- if(_commSize > 1)
+ if(_commSize > 1)
fprintf(stderr, "Error : [On processor %d] %s\n", _commRank, str);
else
fprintf(stderr, "Error : %s\n", str);
@@ -195,7 +193,7 @@ void Message::Error(const char *fmt, ...)
}
}
-void Message::Warning(const char *fmt, ...)
+void Msg::Warning(const char *fmt, ...)
{
_warningCount++;
@@ -223,7 +221,7 @@ void Message::Warning(const char *fmt, ...)
}
}
-void Message::Info(const char *fmt, ...)
+void Msg::Info(const char *fmt, ...)
{
if(_commRank || _verbosity < 3) return;
@@ -249,7 +247,7 @@ void Message::Info(const char *fmt, ...)
}
}
-void Message::Direct(const char *fmt, ...)
+void Msg::Direct(const char *fmt, ...)
{
if(_commRank || _verbosity < 3) return;
@@ -261,7 +259,7 @@ void Message::Direct(const char *fmt, ...)
Direct(3, str);
}
-void Message::Direct(int level, const char *fmt, ...)
+void Msg::Direct(int level, const char *fmt, ...)
{
if(_commRank || _verbosity < level) return;
@@ -286,14 +284,14 @@ void Message::Direct(int level, const char *fmt, ...)
WID->create_message_window();
}
#endif
-
+
if(CTX.terminal){
fprintf(stdout, "%s\n", str);
fflush(stdout);
}
}
-void Message::StatusBar(int num, bool log, const char *fmt, ...)
+void Msg::StatusBar(int num, bool log, const char *fmt, ...)
{
if(_commRank || _verbosity < 4) return;
if(num < 1 || num > 3) return;
@@ -323,7 +321,7 @@ void Message::StatusBar(int num, bool log, const char *fmt, ...)
}
}
-void Message::Debug(const char *fmt, ...)
+void Msg::Debug(const char *fmt, ...)
{
if(_verbosity < 99) return;
@@ -343,7 +341,7 @@ void Message::Debug(const char *fmt, ...)
#endif
if(CTX.terminal){
- if(_commSize > 1)
+ if(_commSize > 1)
fprintf(stdout, "Debug : [On processor %d] %s\n", _commRank, str);
else
fprintf(stdout, "Debug : %s\n", str);
@@ -351,7 +349,7 @@ void Message::Debug(const char *fmt, ...)
}
}
-void Message::ProgressMeter(int n, int N, const char *fmt, ...)
+void Msg::ProgressMeter(int n, int N, const char *fmt, ...)
{
if(_commRank || _verbosity < 3) return;
@@ -394,11 +392,11 @@ void Message::ProgressMeter(int n, int N, const char *fmt, ...)
}
}
-void Message::PrintTimers()
+void Msg::PrintTimers()
{
// do a single stdio call!
std::string str;
- for(std::map<std::string, double>::iterator it = _timers.begin();
+ for(std::map<std::string, double>::iterator it = _timers.begin();
it != _timers.end(); it++){
if(it != _timers.begin()) str += ", ";
char tmp[256];
@@ -408,7 +406,7 @@ void Message::PrintTimers()
if(!str.size()) return;
if(CTX.terminal){
- if(_commSize > 1)
+ if(_commSize > 1)
fprintf(stdout, "Timers : [On processor %d] %s\n", _commRank, str.c_str());
else
fprintf(stdout, "Timers : %s\n", str.c_str());
@@ -416,7 +414,7 @@ void Message::PrintTimers()
}
}
-void Message::PrintErrorCounter(const char *title)
+void Msg::PrintErrorCounter(const char *title)
{
if(_commRank || _verbosity < 1) return;
if(!_warningCount && !_errorCount) return;
@@ -445,15 +443,15 @@ void Message::PrintErrorCounter(const char *title)
#endif
if(CTX.terminal){
- fprintf(stderr, "%s\n%s\n%s\n%s\n%s\n%s\n", (prefix + line).c_str(),
+ fprintf(stderr, "%s\n%s\n%s\n%s\n%s\n%s\n", (prefix + line).c_str(),
(prefix + title).c_str(), (prefix + warn).c_str(),
- (prefix + err).c_str(), (prefix + help).c_str(),
+ (prefix + err).c_str(), (prefix + help).c_str(),
(prefix + line).c_str());
fflush(stderr);
}
}
-double Message::GetValue(const char *text, double defaultval)
+double Msg::GetValue(const char *text, double defaultval)
{
// if a callback is given let's assume we don't want to be bothered
// with interactive stuff
@@ -480,7 +478,7 @@ double Message::GetValue(const char *text, double defaultval)
return atof(str);
}
-bool Message::GetBinaryAnswer(const char *question, const char *yes,
+bool Msg::GetBinaryAnswer(const char *question, const char *yes,
const char *no, bool defaultval)
{
// if a callback is given let's assume we don't want to be bothered
@@ -497,7 +495,7 @@ bool Message::GetBinaryAnswer(const char *question, const char *yes,
#endif
while(1){
- printf("%s\n\n[%s] or [%s]? (default=%s) ", question, yes, no,
+ printf("%s\n\n[%s] or [%s]? (default=%s) ", question, yes, no,
defaultval ? yes : no);
char str[256];
char *ret = fgets(str, sizeof(str), stdin);
@@ -510,7 +508,7 @@ bool Message::GetBinaryAnswer(const char *question, const char *yes,
}
}
-void Message::Barrier()
+void Msg::Barrier()
{
#if defined(HAVE_MPI)
MPI_Barrier(MPI_COMM_WORLD);
@@ -521,14 +519,14 @@ void Message::Barrier()
#include <omp.h>
-int Message::GetNumThreads(){ return omp_get_num_threads(); }
-int Message::GetMaxThreads(){ return omp_get_max_threads(); }
-int Message::GetThreadNum(){ return omp_get_thread_num(); }
+int Msg::GetNumThreads(){ return omp_get_num_threads(); }
+int Msg::GetMaxThreads(){ return omp_get_max_threads(); }
+int Msg::GetThreadNum(){ return omp_get_thread_num(); }
#else
-int Message::GetNumThreads(){ return 1; }
-int Message::GetMaxThreads(){ return 1; }
-int Message::GetThreadNum(){ return 0; }
+int Msg::GetNumThreads(){ return 1; }
+int Msg::GetMaxThreads(){ return 1; }
+int Msg::GetThreadNum(){ return 0; }
#endif
diff --git a/Common/Message.h b/Common/GmshMessage.h
similarity index 90%
rename from Common/Message.h
rename to Common/GmshMessage.h
index ed5fe16fcd..90feb6505a 100644
--- a/Common/Message.h
+++ b/Common/GmshMessage.h
@@ -3,17 +3,23 @@
// See the LICENSE.txt file for license information. Please report all
// bugs and problems to <gmsh@geuz.org>.
-#ifndef _MESSAGE_H_
-#define _MESSAGE_H_
+#ifndef _GMSH_MESSAGE_H_
+#define _GMSH_MESSAGE_H_
#include <map>
#include <string>
#include <stdarg.h>
-class GmshMessage;
+// the external message handler
+class GmshMessage{
+ public:
+ GmshMessage(){}
+ virtual ~GmshMessage(){}
+ virtual void operator()(std::string level, std::string message){}
+};
// a class to manage messages
-class Message {
+class Msg {
private:
// current cpu number and total number of cpus
static int _commRank, _commSize;
@@ -28,7 +34,7 @@ class Message {
// callback
static GmshMessage *_callback;
public:
- Message() {}
+ Msg() {}
static void Init(int argc, char **argv);
static void Exit(int level);
static int GetCommRank(){ return _commRank; }
@@ -63,6 +69,4 @@ class Message {
const char *no, bool defaultval=true);
};
-typedef Message Msg;
-
#endif
diff --git a/Common/ListUtils.cpp b/Common/ListUtils.cpp
index c12bed2f30..6eb8551647 100644
--- a/Common/ListUtils.cpp
+++ b/Common/ListUtils.cpp
@@ -15,7 +15,7 @@
#include "MallocUtils.h"
#include "ListUtils.h"
#include "TreeUtils.h"
-#include "Message.h"
+#include "GmshMessage.h"
List_T *List_Create(int n, int incr, int size)
{
diff --git a/Common/Main.cpp b/Common/Main.cpp
index 13c6353a87..8df8a5591c 100644
--- a/Common/Main.cpp
+++ b/Common/Main.cpp
@@ -7,7 +7,7 @@
#include "Gmsh.h"
#include "GModel.h"
#include "CommandLine.h"
-#include "Message.h"
+#include "GmshMessage.h"
#include "Context.h"
extern Context_T CTX;
diff --git a/Common/Makefile b/Common/Makefile
index 3780e4562c..7fe6b6d542 100644
--- a/Common/Makefile
+++ b/Common/Makefile
@@ -19,11 +19,11 @@ SRC = Context.cpp\
Options.cpp\
CommandLine.cpp\
Gmsh.cpp\
+ GmshMessage.cpp\
GmshDaemon.cpp\
OS.cpp\
OpenFile.cpp\
CreateFile.cpp\
- Message.cpp\
Visibility.cpp\
Trackball.cpp\
VertexArray.cpp\
@@ -62,7 +62,7 @@ depend:
Context.o: Context.cpp ../Numeric/Numeric.h ../Numeric/NumericEmbedded.h \
Context.h ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h Trackball.h
Octree.o: Octree.cpp Octree.h OctreeInternals.h
-OctreeInternals.o: OctreeInternals.cpp Message.h OctreeInternals.h
+OctreeInternals.o: OctreeInternals.cpp GmshMessage.h OctreeInternals.h
Options.o: Options.cpp GmshUI.h GmshDefines.h ../Geo/GModel.h \
../Geo/GVertex.h ../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \
../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Geo/GPoint.h \
@@ -71,19 +71,19 @@ Options.o: Options.cpp GmshUI.h GmshDefines.h ../Geo/GModel.h \
../Geo/GFace.h ../Geo/GEntity.h ../Geo/GPoint.h ../Geo/GEdgeLoop.h \
../Geo/GEdge.h ../Geo/SPoint2.h ../Geo/SVector3.h ../Geo/Pair.h \
../Geo/GRegion.h ../Geo/GEntity.h ../Geo/SPoint3.h \
- ../Geo/SBoundingBox3d.h Message.h ../Graphics/Draw.h \
+ ../Geo/SBoundingBox3d.h GmshMessage.h ../Graphics/Draw.h \
../Mesh/Generator.h Context.h ../Geo/CGNSOptions.h \
../Mesh/PartitionOptions.h Options.h ../Post/ColorTable.h \
DefaultOptions.h ../Mesh/Field.h ../Post/PView.h \
../Mesh/BackgroundMesh.h ../Post/PViewOptions.h ../Post/ColorTable.h \
../Post/PViewData.h ../Post/adaptiveData.h ../Common/ListUtils.h \
../Common/GmshMatrix.h ../Plugin/PluginManager.h ../Plugin/Plugin.h \
- ../Common/Options.h ../Common/Message.h ../Post/PViewDataList.h \
+ ../Common/Options.h ../Common/GmshMessage.h ../Post/PViewDataList.h \
../Post/PViewData.h ../Fltk/Solvers.h ../Fltk/GUI.h \
../Fltk/Opengl_Window.h ../Fltk/Colorbar_Window.h ../Common/GmshUI.h \
../Fltk/Popup_Button.h ../Fltk/SpherePosition_Widget.h
CommandLine.o: CommandLine.cpp GmshUI.h GmshDefines.h GmshVersion.h \
- Message.h OpenFile.h CommandLine.h Context.h ../Geo/CGNSOptions.h \
+ GmshMessage.h OpenFile.h CommandLine.h Context.h ../Geo/CGNSOptions.h \
../Mesh/PartitionOptions.h Options.h ../Post/ColorTable.h \
../Geo/GModel.h ../Geo/GVertex.h ../Geo/GEntity.h ../Geo/Range.h \
../Geo/SPoint3.h ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h \
@@ -101,19 +101,25 @@ Gmsh.o: Gmsh.cpp GmshDefines.h ../Geo/GModel.h ../Geo/GVertex.h \
../Geo/GFace.h ../Geo/GEntity.h ../Geo/GPoint.h ../Geo/GEdgeLoop.h \
../Geo/GEdge.h ../Geo/SPoint2.h ../Geo/SVector3.h ../Geo/Pair.h \
../Geo/GRegion.h ../Geo/GEntity.h ../Geo/SPoint3.h \
- ../Geo/SBoundingBox3d.h Message.h OpenFile.h CreateFile.h Options.h \
+ ../Geo/SBoundingBox3d.h GmshMessage.h OpenFile.h CreateFile.h Options.h \
../Post/ColorTable.h CommandLine.h OS.h ../Numeric/Numeric.h \
../Numeric/NumericEmbedded.h ../Mesh/Generator.h ../Mesh/Field.h \
../Post/PView.h Context.h ../Geo/CGNSOptions.h \
../Mesh/PartitionOptions.h ../Mesh/Partition.h GmshDaemon.h \
../Plugin/PluginManager.h
-GmshDaemon.o: GmshDaemon.cpp Message.h OS.h GmshSocket.h
-OS.o: OS.cpp Message.h
-OpenFile.o: OpenFile.cpp Message.h ../Geo/Geo.h ../Common/GmshDefines.h \
- ../Geo/gmshSurface.h ../Geo/Pair.h ../Geo/Range.h ../Geo/SPoint2.h \
- ../Geo/SPoint3.h ../Geo/SVector3.h ../Geo/SPoint3.h \
- ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Numeric/Numeric.h \
- ../Numeric/NumericEmbedded.h ../Common/ListUtils.h \
+GmshMessage.o: GmshMessage.cpp GmshMessage.h Gmsh.h Options.h \
+ ../Post/ColorTable.h Context.h ../Geo/CGNSOptions.h \
+ ../Mesh/PartitionOptions.h OS.h ../Fltk/GUI.h ../Fltk/Opengl_Window.h \
+ ../Fltk/Colorbar_Window.h ../Common/GmshUI.h ../Fltk/Popup_Button.h \
+ ../Fltk/SpherePosition_Widget.h ../Mesh/Field.h ../Post/PView.h \
+ ../Geo/SPoint3.h ../Fltk/GUI_Extras.h
+GmshDaemon.o: GmshDaemon.cpp GmshMessage.h OS.h GmshSocket.h
+OS.o: OS.cpp GmshMessage.h
+OpenFile.o: OpenFile.cpp GmshMessage.h ../Geo/Geo.h \
+ ../Common/GmshDefines.h ../Geo/gmshSurface.h ../Geo/Pair.h \
+ ../Geo/Range.h ../Geo/SPoint2.h ../Geo/SPoint3.h ../Geo/SVector3.h \
+ ../Geo/SPoint3.h ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h \
+ ../Numeric/Numeric.h ../Numeric/NumericEmbedded.h ../Common/ListUtils.h \
../Common/TreeUtils.h ../Common/avl.h ../Common/ListUtils.h \
../Geo/SPoint2.h ../Geo/ExtrudeParams.h ../Common/SmoothData.h \
../Geo/GModel.h ../Geo/GVertex.h ../Geo/GEntity.h ../Geo/Range.h \
@@ -130,8 +136,8 @@ OpenFile.o: OpenFile.cpp Message.h ../Geo/Geo.h ../Common/GmshDefines.h \
../Fltk/Opengl_Window.h ../Fltk/Colorbar_Window.h ../Common/GmshUI.h \
../Post/ColorTable.h ../Fltk/Popup_Button.h \
../Fltk/SpherePosition_Widget.h ../Mesh/Field.h
-CreateFile.o: CreateFile.cpp Message.h ../Geo/GModel.h ../Geo/GVertex.h \
- ../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \
+CreateFile.o: CreateFile.cpp GmshMessage.h ../Geo/GModel.h \
+ ../Geo/GVertex.h ../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \
../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Geo/GPoint.h \
../Geo/SPoint2.h ../Geo/GEdge.h ../Geo/GEntity.h ../Geo/GVertex.h \
../Geo/SVector3.h ../Geo/SPoint3.h ../Geo/SPoint3.h ../Geo/SPoint2.h \
@@ -141,18 +147,12 @@ CreateFile.o: CreateFile.cpp Message.h ../Geo/GModel.h ../Geo/GVertex.h \
../Geo/SBoundingBox3d.h GmshDefines.h StringUtils.h Context.h \
../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h Options.h \
../Post/ColorTable.h GmshUI.h ../Graphics/gl2ps.h ../Graphics/gl2gif.h \
- ../Graphics/PixelBuffer.h ../Common/GmshUI.h ../Common/Message.h \
+ ../Graphics/PixelBuffer.h ../Common/GmshUI.h ../Common/GmshMessage.h \
../Common/MallocUtils.h ../Graphics/Draw.h ../Graphics/gl2jpeg.h \
../Graphics/PixelBuffer.h ../Graphics/gl2png.h \
../Graphics/PixelBuffer.h ../Graphics/gl2ppm.h \
../Graphics/PixelBuffer.h ../Graphics/gl2yuv.h \
../Graphics/PixelBuffer.h
-Message.o: Message.cpp Message.h Gmsh.h Options.h ../Post/ColorTable.h \
- Context.h ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h OS.h \
- ../Fltk/GUI.h ../Fltk/Opengl_Window.h ../Fltk/Colorbar_Window.h \
- ../Common/GmshUI.h ../Fltk/Popup_Button.h \
- ../Fltk/SpherePosition_Widget.h ../Mesh/Field.h ../Post/PView.h \
- ../Geo/SPoint3.h ../Fltk/GUI_Extras.h
Visibility.o: Visibility.cpp Visibility.h GmshDefines.h ../Geo/GVertex.h \
../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \
../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Geo/GPoint.h \
@@ -165,8 +165,8 @@ Visibility.o: Visibility.cpp Visibility.h GmshDefines.h ../Geo/GVertex.h \
../Geo/SBoundingBox3d.h ../Geo/MElement.h ../Common/GmshDefines.h \
../Geo/MVertex.h ../Geo/SPoint3.h ../Geo/MEdge.h ../Geo/MVertex.h \
../Geo/SVector3.h ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h \
- ../Common/Message.h ../Numeric/FunctionSpace.h ../Common/GmshMatrix.h \
- ../Parser/Parser.h
+ ../Common/GmshMessage.h ../Numeric/FunctionSpace.h \
+ ../Common/GmshMatrix.h ../Parser/Parser.h
Trackball.o: Trackball.cpp Trackball.h
VertexArray.o: VertexArray.cpp VertexArray.h ../Geo/SVector3.h \
../Geo/SPoint3.h Context.h ../Geo/CGNSOptions.h \
@@ -176,7 +176,7 @@ SmoothData.o: SmoothData.cpp SmoothData.h ../Numeric/Numeric.h \
../Numeric/NumericEmbedded.h
StringUtils.o: StringUtils.cpp StringUtils.h
ListUtils.o: ListUtils.cpp MallocUtils.h ListUtils.h TreeUtils.h avl.h \
- Message.h
+ GmshMessage.h
TreeUtils.o: TreeUtils.cpp MallocUtils.h TreeUtils.h avl.h ListUtils.h
avl.o: avl.cpp avl.h MallocUtils.h
-MallocUtils.o: MallocUtils.cpp MallocUtils.h Message.h
+MallocUtils.o: MallocUtils.cpp MallocUtils.h GmshMessage.h
diff --git a/Common/MallocUtils.cpp b/Common/MallocUtils.cpp
index f1c6debe83..742c058799 100644
--- a/Common/MallocUtils.cpp
+++ b/Common/MallocUtils.cpp
@@ -7,7 +7,7 @@
#include <stdlib.h>
#include "MallocUtils.h"
-#include "Message.h"
+#include "GmshMessage.h"
void *Malloc(size_t size)
{
diff --git a/Common/OS.cpp b/Common/OS.cpp
index 5f9ca684ca..928b42a355 100644
--- a/Common/OS.cpp
+++ b/Common/OS.cpp
@@ -32,7 +32,7 @@
#define RUSAGE_CHILDREN -1
#endif
-#include "Message.h"
+#include "GmshMessage.h"
double GetTimeInSeconds()
{
diff --git a/Common/OctreeInternals.cpp b/Common/OctreeInternals.cpp
index ca5157b981..8f9b28002a 100644
--- a/Common/OctreeInternals.cpp
+++ b/Common/OctreeInternals.cpp
@@ -13,7 +13,7 @@
#include <math.h>
#include <list>
-#include "Message.h"
+#include "GmshMessage.h"
#include "OctreeInternals.h"
using std::list;
diff --git a/Common/OpenFile.cpp b/Common/OpenFile.cpp
index c995201643..f02aa8c8c4 100644
--- a/Common/OpenFile.cpp
+++ b/Common/OpenFile.cpp
@@ -4,7 +4,7 @@
// bugs and problems to <gmsh@geuz.org>.
#include <string.h>
-#include "Message.h"
+#include "GmshMessage.h"
#include "Geo.h"
#include "GModel.h"
#include "Numeric.h"
diff --git a/Common/Options.cpp b/Common/Options.cpp
index 3106b85c4e..b69b767aef 100644
--- a/Common/Options.cpp
+++ b/Common/Options.cpp
@@ -8,7 +8,7 @@
#include "GmshUI.h"
#include "GmshDefines.h"
#include "GModel.h"
-#include "Message.h"
+#include "GmshMessage.h"
#include "Draw.h"
#include "Generator.h"
#include "Context.h"
diff --git a/Fltk/Callbacks.cpp b/Fltk/Callbacks.cpp
index 0c3fa60e15..40b7c46eea 100644
--- a/Fltk/Callbacks.cpp
+++ b/Fltk/Callbacks.cpp
@@ -11,7 +11,7 @@
#include <sstream>
#include "GmshUI.h"
-#include "Message.h"
+#include "GmshMessage.h"
#include "MallocUtils.h"
#include "ListUtils.h"
#include "StringUtils.h"
diff --git a/Fltk/GUI.cpp b/Fltk/GUI.cpp
index 4fcef5fe72..22911f7432 100644
--- a/Fltk/GUI.cpp
+++ b/Fltk/GUI.cpp
@@ -7,7 +7,7 @@
#include <sstream>
#include "GmshUI.h"
#include "GmshDefines.h"
-#include "Message.h"
+#include "GmshMessage.h"
#include "Numeric.h"
#include "Context.h"
#include "Options.h"
diff --git a/Fltk/GUI_Classifier.cpp b/Fltk/GUI_Classifier.cpp
index 1a445d0d59..a6c0528bb3 100644
--- a/Fltk/GUI_Classifier.cpp
+++ b/Fltk/GUI_Classifier.cpp
@@ -11,7 +11,7 @@
#include "SelectBuffer.h"
#include "GUI_Projection.h"
#include "GUI_Extras.h"
-#include "Message.h"
+#include "GmshMessage.h"
#include "meshGFaceDelaunayInsertion.h"
#include "meshGFaceOptimize.h"
#include "discreteEdge.h"
diff --git a/Fltk/GUI_Projection.cpp b/Fltk/GUI_Projection.cpp
index aa1d36d669..aa609b8b51 100644
--- a/Fltk/GUI_Projection.cpp
+++ b/Fltk/GUI_Projection.cpp
@@ -12,7 +12,7 @@
#include "GUI_Projection.h"
#include "GUI_Extras.h"
#include "fourierFace.h"
-#include "Message.h"
+#include "GmshMessage.h"
extern Context_T CTX;
diff --git a/Fltk/Main.cpp b/Fltk/Main.cpp
index f14a3525df..1aa0c160b5 100644
--- a/Fltk/Main.cpp
+++ b/Fltk/Main.cpp
@@ -8,7 +8,7 @@
#include "GUI.h"
#include "Gmsh.h"
#include "GmshUI.h"
-#include "Message.h"
+#include "GmshMessage.h"
#include "Draw.h"
#include "Context.h"
#include "Options.h"
diff --git a/Fltk/Makefile b/Fltk/Makefile
index b091e146d5..002ad0a074 100644
--- a/Fltk/Makefile
+++ b/Fltk/Makefile
@@ -57,7 +57,7 @@ depend:
Main.o: Main.cpp GUI.h Opengl_Window.h Colorbar_Window.h \
../Common/GmshUI.h ../Post/ColorTable.h Popup_Button.h \
SpherePosition_Widget.h ../Mesh/Field.h ../Post/PView.h \
- ../Geo/SPoint3.h ../Common/Gmsh.h ../Common/Message.h \
+ ../Geo/SPoint3.h ../Common/Gmsh.h ../Common/GmshMessage.h \
../Graphics/Draw.h ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h \
../Common/Context.h ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h \
../Common/Options.h ../Parser/Parser.h ../Common/OpenFile.h \
@@ -71,24 +71,24 @@ Main.o: Main.cpp GUI.h Opengl_Window.h Colorbar_Window.h \
../Geo/GRegion.h ../Geo/GEntity.h ../Geo/SPoint3.h \
../Geo/SBoundingBox3d.h ../Mesh/BackgroundMesh.h
GUI.o: GUI.cpp ../Common/GmshUI.h ../Common/GmshDefines.h \
- ../Common/Message.h ../Numeric/Numeric.h ../Numeric/NumericEmbedded.h \
- ../Common/Context.h ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h \
- ../Common/Options.h ../Post/ColorTable.h ../Graphics/Draw.h \
- ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h GUI.h Opengl_Window.h \
- Colorbar_Window.h Popup_Button.h SpherePosition_Widget.h \
- ../Mesh/Field.h ../Post/PView.h Callbacks.h Win32Icon.h \
- ../Common/OpenFile.h ../Common/CommandLine.h ../Mesh/Generator.h \
- Solvers.h ../Plugin/PluginManager.h ../Plugin/Plugin.h \
- ../Post/PViewDataList.h ../Post/PViewData.h ../Common/ListUtils.h \
- ../Common/GmshMatrix.h Shortcut_Window.h ../Post/PViewOptions.h \
- ../Post/ColorTable.h ../Geo/GModel.h ../Geo/GVertex.h ../Geo/GEntity.h \
- ../Geo/Range.h ../Geo/SPoint3.h ../Geo/SBoundingBox3d.h ../Geo/GPoint.h \
- ../Geo/SPoint2.h ../Geo/GEdge.h ../Geo/GEntity.h ../Geo/GVertex.h \
- ../Geo/SVector3.h ../Geo/SPoint3.h ../Geo/SPoint3.h ../Geo/SPoint2.h \
- ../Geo/GFace.h ../Geo/GEntity.h ../Geo/GPoint.h ../Geo/GEdgeLoop.h \
- ../Geo/GEdge.h ../Geo/SPoint2.h ../Geo/SVector3.h ../Geo/Pair.h \
- ../Geo/GRegion.h ../Geo/GEntity.h ../Geo/SPoint3.h \
- ../Geo/SBoundingBox3d.h ../Geo/GeoStringInterface.h \
+ ../Common/GmshMessage.h ../Numeric/Numeric.h \
+ ../Numeric/NumericEmbedded.h ../Common/Context.h ../Geo/CGNSOptions.h \
+ ../Mesh/PartitionOptions.h ../Common/Options.h ../Post/ColorTable.h \
+ ../Graphics/Draw.h ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h GUI.h \
+ Opengl_Window.h Colorbar_Window.h Popup_Button.h \
+ SpherePosition_Widget.h ../Mesh/Field.h ../Post/PView.h Callbacks.h \
+ Win32Icon.h ../Common/OpenFile.h ../Common/CommandLine.h \
+ ../Mesh/Generator.h Solvers.h ../Plugin/PluginManager.h \
+ ../Plugin/Plugin.h ../Post/PViewDataList.h ../Post/PViewData.h \
+ ../Common/ListUtils.h ../Common/GmshMatrix.h Shortcut_Window.h \
+ ../Post/PViewOptions.h ../Post/ColorTable.h ../Geo/GModel.h \
+ ../Geo/GVertex.h ../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \
+ ../Geo/SBoundingBox3d.h ../Geo/GPoint.h ../Geo/SPoint2.h ../Geo/GEdge.h \
+ ../Geo/GEntity.h ../Geo/GVertex.h ../Geo/SVector3.h ../Geo/SPoint3.h \
+ ../Geo/SPoint3.h ../Geo/SPoint2.h ../Geo/GFace.h ../Geo/GEntity.h \
+ ../Geo/GPoint.h ../Geo/GEdgeLoop.h ../Geo/GEdge.h ../Geo/SPoint2.h \
+ ../Geo/SVector3.h ../Geo/Pair.h ../Geo/GRegion.h ../Geo/GEntity.h \
+ ../Geo/SPoint3.h ../Geo/SBoundingBox3d.h ../Geo/GeoStringInterface.h \
../Common/StringUtils.h ../Common/GmshSocket.h
GUI_Extras.o: GUI_Extras.cpp ../Common/GmshUI.h ../Common/GmshDefines.h \
../Common/CreateFile.h ../Common/Options.h ../Post/ColorTable.h \
@@ -115,12 +115,13 @@ GUI_Projection.o: GUI_Projection.cpp ../Geo/GModelIO_Fourier.h \
../Geo/SBoundingBox3d.h ../Geo/MElement.h ../Common/GmshDefines.h \
../Geo/MVertex.h ../Geo/SPoint3.h ../Geo/MEdge.h ../Geo/MVertex.h \
../Geo/SVector3.h ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h \
- ../Common/Message.h ../Numeric/FunctionSpace.h ../Common/GmshMatrix.h \
- ../Graphics/Draw.h ../Common/Options.h ../Post/ColorTable.h \
- ../Common/Context.h ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h \
- ../Common/StringUtils.h ../Graphics/SelectBuffer.h GUI_Projection.h \
- ../Common/GmshUI.h ../Geo/fourierProjectionFace.h ../Geo/GModel.h \
- ../Geo/Range.h GUI.h Opengl_Window.h Colorbar_Window.h Popup_Button.h \
+ ../Common/GmshMessage.h ../Numeric/FunctionSpace.h \
+ ../Common/GmshMatrix.h ../Graphics/Draw.h ../Common/Options.h \
+ ../Post/ColorTable.h ../Common/Context.h ../Geo/CGNSOptions.h \
+ ../Mesh/PartitionOptions.h ../Common/StringUtils.h \
+ ../Graphics/SelectBuffer.h GUI_Projection.h ../Common/GmshUI.h \
+ ../Geo/fourierProjectionFace.h ../Geo/GModel.h ../Geo/Range.h GUI.h \
+ Opengl_Window.h Colorbar_Window.h Popup_Button.h \
SpherePosition_Widget.h ../Mesh/Field.h ../Post/PView.h \
Shortcut_Window.h GUI_Extras.h ../Geo/fourierFace.h ../Geo/GFace.h \
../Geo/GModel.h ../Geo/Range.h ../Geo/fourierEdge.h ../Geo/GEdge.h \
@@ -137,19 +138,19 @@ GUI_Classifier.o: GUI_Classifier.cpp GUI_Classifier.h ../Common/GmshUI.h \
../Geo/SBoundingBox3d.h ../Geo/MElement.h ../Common/GmshDefines.h \
../Geo/MVertex.h ../Geo/SPoint3.h ../Geo/MEdge.h ../Geo/MVertex.h \
../Geo/SVector3.h ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h \
- ../Common/Message.h ../Numeric/FunctionSpace.h ../Common/GmshMatrix.h \
- GUI.h Opengl_Window.h Colorbar_Window.h ../Post/ColorTable.h \
- Popup_Button.h SpherePosition_Widget.h ../Mesh/Field.h ../Post/PView.h \
- Shortcut_Window.h ../Numeric/Numeric.h ../Numeric/NumericEmbedded.h \
- ../Graphics/Draw.h ../Common/Options.h ../Common/Context.h \
- ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h \
+ ../Common/GmshMessage.h ../Numeric/FunctionSpace.h \
+ ../Common/GmshMatrix.h GUI.h Opengl_Window.h Colorbar_Window.h \
+ ../Post/ColorTable.h Popup_Button.h SpherePosition_Widget.h \
+ ../Mesh/Field.h ../Post/PView.h Shortcut_Window.h ../Numeric/Numeric.h \
+ ../Numeric/NumericEmbedded.h ../Graphics/Draw.h ../Common/Options.h \
+ ../Common/Context.h ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h \
../Graphics/SelectBuffer.h GUI_Projection.h \
../Geo/fourierProjectionFace.h ../Geo/GModel.h ../Geo/Range.h \
GUI_Extras.h ../Mesh/meshGFaceDelaunayInsertion.h \
../Mesh/meshGFaceOptimize.h ../Mesh/meshGFaceDelaunayInsertion.h \
../Geo/discreteEdge.h ../Geo/GModel.h ../Geo/GEdge.h \
../Geo/discreteFace.h ../Geo/GModel.h ../Geo/GFace.h
-Callbacks.o: Callbacks.cpp ../Common/GmshUI.h ../Common/Message.h \
+Callbacks.o: Callbacks.cpp ../Common/GmshUI.h ../Common/GmshMessage.h \
../Common/MallocUtils.h ../Common/ListUtils.h ../Common/StringUtils.h \
../Geo/GModel.h ../Geo/GVertex.h ../Geo/GEntity.h ../Geo/Range.h \
../Geo/SPoint3.h ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h \
@@ -188,7 +189,7 @@ Opengl.o: Opengl.cpp ../Common/GmshUI.h ../Common/GmshDefines.h \
../Post/ColorTable.h Popup_Button.h SpherePosition_Widget.h \
../Mesh/Field.h ../Post/PView.h ../Graphics/gl2ps.h
Opengl_Window.o: Opengl_Window.cpp ../Common/GmshUI.h \
- ../Common/GmshDefines.h ../Common/Message.h ../Numeric/Numeric.h \
+ ../Common/GmshDefines.h ../Common/GmshMessage.h ../Numeric/Numeric.h \
../Numeric/NumericEmbedded.h ../Common/Context.h ../Geo/CGNSOptions.h \
../Mesh/PartitionOptions.h ../Graphics/Draw.h ../Geo/SBoundingBox3d.h \
../Geo/SPoint3.h ../Graphics/SelectBuffer.h ../Geo/GVertex.h \
@@ -208,7 +209,7 @@ Colorbar_Window.o: Colorbar_Window.cpp ../Common/GmshUI.h GUI.h \
SpherePosition_Widget.h ../Mesh/Field.h ../Post/PView.h \
../Geo/SPoint3.h ../Common/Context.h ../Geo/CGNSOptions.h \
../Mesh/PartitionOptions.h
-Solvers.o: Solvers.cpp ../Common/Message.h ../Common/StringUtils.h \
+Solvers.o: Solvers.cpp ../Common/GmshMessage.h ../Common/StringUtils.h \
Solvers.h ../Common/GmshSocket.h ../Common/OpenFile.h \
../Common/GmshUI.h GUI.h Opengl_Window.h Colorbar_Window.h \
../Post/ColorTable.h Popup_Button.h SpherePosition_Widget.h \
diff --git a/Fltk/Opengl_Window.cpp b/Fltk/Opengl_Window.cpp
index c93e77173f..bbd6e2ac5b 100644
--- a/Fltk/Opengl_Window.cpp
+++ b/Fltk/Opengl_Window.cpp
@@ -5,7 +5,7 @@
#include "GmshUI.h"
#include "GmshDefines.h"
-#include "Message.h"
+#include "GmshMessage.h"
#include "Numeric.h"
#include "Context.h"
#include "Draw.h"
diff --git a/Fltk/Solvers.cpp b/Fltk/Solvers.cpp
index 44f92777ff..58c51273d7 100644
--- a/Fltk/Solvers.cpp
+++ b/Fltk/Solvers.cpp
@@ -5,7 +5,7 @@
#include <string.h>
#include <string>
-#include "Message.h"
+#include "GmshMessage.h"
#include "StringUtils.h"
#include "Solvers.h"
#include "GmshSocket.h"
diff --git a/Geo/CustomContainer.h b/Geo/CustomContainer.h
index ef9cf2c5ff..3e711a8bc8 100644
--- a/Geo/CustomContainer.h
+++ b/Geo/CustomContainer.h
@@ -11,7 +11,7 @@
#include <cstdlib>
#include <cstring>
-#include "Message.h"
+#include "GmshMessage.h"
/*******************************************************************************
*
diff --git a/Geo/ExtrudeParams.cpp b/Geo/ExtrudeParams.cpp
index ce2e678769..ae35785ec7 100644
--- a/Geo/ExtrudeParams.cpp
+++ b/Geo/ExtrudeParams.cpp
@@ -3,7 +3,7 @@
// See the LICENSE.txt file for license information. Please report all
// bugs and problems to <gmsh@geuz.org>.
-#include "Message.h"
+#include "GmshMessage.h"
#include "Geo.h"
#include "ExtrudeParams.h"
diff --git a/Geo/GEdge.cpp b/Geo/GEdge.cpp
index 103b645451..4caab71b01 100644
--- a/Geo/GEdge.cpp
+++ b/Geo/GEdge.cpp
@@ -10,7 +10,7 @@
#include "GFace.h"
#include "MElement.h"
#include "GmshDefines.h"
-#include "Message.h"
+#include "GmshMessage.h"
#if !defined(HAVE_GMSH_EMBEDDED)
#include "GaussLegendre1D.h"
diff --git a/Geo/GEdgeLoop.cpp b/Geo/GEdgeLoop.cpp
index 0bd91a142b..c747f1ff02 100644
--- a/Geo/GEdgeLoop.cpp
+++ b/Geo/GEdgeLoop.cpp
@@ -6,7 +6,7 @@
#include <algorithm>
#include <functional>
#include "GEdgeLoop.h"
-#include "Message.h"
+#include "GmshMessage.h"
void GEdgeSigned::print() const
{
diff --git a/Geo/GFace.cpp b/Geo/GFace.cpp
index b5de31a21a..428296164b 100644
--- a/Geo/GFace.cpp
+++ b/Geo/GFace.cpp
@@ -8,7 +8,7 @@
#include "GFace.h"
#include "GEdge.h"
#include "MElement.h"
-#include "Message.h"
+#include "GmshMessage.h"
#include "VertexArray.h"
#if defined(HAVE_GMSH_EMBEDDED)
diff --git a/Geo/GModel.cpp b/Geo/GModel.cpp
index f15bec8545..d0d6436634 100644
--- a/Geo/GModel.cpp
+++ b/Geo/GModel.cpp
@@ -10,7 +10,7 @@
#include "discreteFace.h"
#include "discreteEdge.h"
#include "discreteVertex.h"
-#include "Message.h"
+#include "GmshMessage.h"
#if defined(HAVE_GMSH_EMBEDDED)
#include "GmshEmbedded.h"
diff --git a/Geo/GModelIO_CGNS.cpp b/Geo/GModelIO_CGNS.cpp
index 2335a4077b..5bc36de235 100644
--- a/Geo/GModelIO_CGNS.cpp
+++ b/Geo/GModelIO_CGNS.cpp
@@ -6,7 +6,7 @@
// GModelIO_CGNS.cpp - Copyright (C) 2008 S. Guzik, C. Geuzaine, J.-F. Remacle
#include "GModel.h"
-#include "Message.h"
+#include "GmshMessage.h"
#include "CGNSOptions.h"
#if defined(HAVE_LIBCGNS)
diff --git a/Geo/GModelIO_Fourier.cpp b/Geo/GModelIO_Fourier.cpp
index f2b8633290..2b2826b43f 100644
--- a/Geo/GModelIO_Fourier.cpp
+++ b/Geo/GModelIO_Fourier.cpp
@@ -4,7 +4,7 @@
// bugs and problems to <gmsh@geuz.org>.
#include <string>
#include "GModel.h"
-#include "Message.h"
+#include "GmshMessage.h"
#include "fourierVertex.h"
#include "fourierEdge.h"
#include "fourierFace.h"
diff --git a/Geo/GModelIO_Geo.cpp b/Geo/GModelIO_Geo.cpp
index 40bc11fde8..b867ad86be 100644
--- a/Geo/GModelIO_Geo.cpp
+++ b/Geo/GModelIO_Geo.cpp
@@ -9,7 +9,7 @@
#include "OpenFile.h"
#include "Numeric.h"
#include "ListUtils.h"
-#include "Message.h"
+#include "GmshMessage.h"
#include "gmshVertex.h"
#include "gmshFace.h"
#include "GFaceCompound.h"
diff --git a/Geo/GModelIO_MED.cpp b/Geo/GModelIO_MED.cpp
index 83c129fd24..38a82894d9 100644
--- a/Geo/GModelIO_MED.cpp
+++ b/Geo/GModelIO_MED.cpp
@@ -5,7 +5,7 @@
#include <string>
#include "GModel.h"
-#include "Message.h"
+#include "GmshMessage.h"
#if defined(HAVE_MED)
diff --git a/Geo/GModelIO_Mesh.cpp b/Geo/GModelIO_Mesh.cpp
index 0ea352cf83..54db9b53be 100644
--- a/Geo/GModelIO_Mesh.cpp
+++ b/Geo/GModelIO_Mesh.cpp
@@ -14,7 +14,7 @@
#include "discreteRegion.h"
#include "discreteFace.h"
#include "StringUtils.h"
-#include "Message.h"
+#include "GmshMessage.h"
static void storePhysicalTagsInEntities(GModel *m, int dim,
std::map<int, std::map<int, std::string> > &map)
diff --git a/Geo/GModelIO_OCC.cpp b/Geo/GModelIO_OCC.cpp
index a5c489df28..80207098e3 100644
--- a/Geo/GModelIO_OCC.cpp
+++ b/Geo/GModelIO_OCC.cpp
@@ -4,7 +4,7 @@
// bugs and problems to <gmsh@geuz.org>.
#include "GModelIO_OCC.h"
-#include "Message.h"
+#include "GmshMessage.h"
#include "Context.h"
#include "OCCVertex.h"
#include "OCCEdge.h"
diff --git a/Geo/GRegion.cpp b/Geo/GRegion.cpp
index 0bc651bc91..eb12adc52d 100644
--- a/Geo/GRegion.cpp
+++ b/Geo/GRegion.cpp
@@ -8,7 +8,7 @@
#include "GRegion.h"
#include "GFace.h"
#include "MElement.h"
-#include "Message.h"
+#include "GmshMessage.h"
GRegion::GRegion(GModel *model, int tag) : GEntity (model, tag)
{
diff --git a/Geo/GVertex.cpp b/Geo/GVertex.cpp
index 3663213518..9a2ace892a 100644
--- a/Geo/GVertex.cpp
+++ b/Geo/GVertex.cpp
@@ -8,7 +8,7 @@
#include "GVertex.h"
#include "GFace.h"
#include "MElement.h"
-#include "Message.h"
+#include "GmshMessage.h"
GVertex::GVertex(GModel *m, int tag, double ms) : GEntity(m, tag), meshSize(ms)
{
diff --git a/Geo/Geo.cpp b/Geo/Geo.cpp
index 71d2605425..6215f9039b 100644
--- a/Geo/Geo.cpp
+++ b/Geo/Geo.cpp
@@ -4,7 +4,7 @@
// bugs and problems to <gmsh@geuz.org>.
#include <string.h>
-#include "Message.h"
+#include "GmshMessage.h"
#include "Numeric.h"
#include "MallocUtils.h"
#include "Geo.h"
diff --git a/Geo/GeoInterpolation.cpp b/Geo/GeoInterpolation.cpp
index 00f59bfc77..6e11c72ad7 100644
--- a/Geo/GeoInterpolation.cpp
+++ b/Geo/GeoInterpolation.cpp
@@ -3,7 +3,7 @@
// See the LICENSE.txt file for license information. Please report all
// bugs and problems to <gmsh@geuz.org>.
-#include "Message.h"
+#include "GmshMessage.h"
#include "Geo.h"
#include "GeoInterpolation.h"
#include "GeoStringInterface.h"
diff --git a/Geo/GeoStringInterface.cpp b/Geo/GeoStringInterface.cpp
index 11721ba74f..ab25c56b3c 100644
--- a/Geo/GeoStringInterface.cpp
+++ b/Geo/GeoStringInterface.cpp
@@ -5,7 +5,7 @@
#include <string.h>
#include <sstream>
-#include "Message.h"
+#include "GmshMessage.h"
#include "Numeric.h"
#include "StringUtils.h"
#include "Geo.h"
diff --git a/Geo/MElement.cpp b/Geo/MElement.cpp
index 00f94cd86f..5ab6a729a1 100644
--- a/Geo/MElement.cpp
+++ b/Geo/MElement.cpp
@@ -8,7 +8,7 @@
#include "MElement.h"
#include "GEntity.h"
#include "GFace.h"
-#include "Message.h"
+#include "GmshMessage.h"
#include "StringUtils.h"
#if defined(HAVE_GMSH_EMBEDDED)
diff --git a/Geo/MElement.h b/Geo/MElement.h
index bdf70b5c80..0935f163a3 100644
--- a/Geo/MElement.h
+++ b/Geo/MElement.h
@@ -13,7 +13,7 @@
#include "MVertex.h"
#include "MEdge.h"
#include "MFace.h"
-#include "Message.h"
+#include "GmshMessage.h"
#include "FunctionSpace.h"
struct IntPt{
diff --git a/Geo/MVertex.cpp b/Geo/MVertex.cpp
index ad1250cf11..5b55c3ff68 100644
--- a/Geo/MVertex.cpp
+++ b/Geo/MVertex.cpp
@@ -9,7 +9,7 @@
#include "GEdge.h"
#include "GFace.h"
#include "GFaceCompound.h"
-#include "Message.h"
+#include "GmshMessage.h"
#include "StringUtils.h"
int MVertex::_globalNum = 0;
diff --git a/Geo/MZoneBoundary.cpp b/Geo/MZoneBoundary.cpp
index 4b4561f41f..df24ae3047 100644
--- a/Geo/MZoneBoundary.cpp
+++ b/Geo/MZoneBoundary.cpp
@@ -11,7 +11,7 @@
#include <limits> // ?
#include "MZoneBoundary.h"
-#include "Message.h"
+#include "GmshMessage.h"
//--Types at local scope
diff --git a/Geo/Makefile b/Geo/Makefile
index 6964533be1..458ee2ad9d 100644
--- a/Geo/Makefile
+++ b/Geo/Makefile
@@ -70,28 +70,28 @@ depend:
GEntity.o: GEntity.cpp GModel.h GVertex.h GEntity.h Range.h SPoint3.h \
SBoundingBox3d.h GPoint.h SPoint2.h GEdge.h SVector3.h GFace.h \
GEdgeLoop.h Pair.h GRegion.h MElement.h ../Common/GmshDefines.h \
- MVertex.h MEdge.h MFace.h ../Common/Message.h \
+ MVertex.h MEdge.h MFace.h ../Common/GmshMessage.h \
../Numeric/FunctionSpace.h ../Common/GmshMatrix.h \
../Common/VertexArray.h ../Geo/SVector3.h ../Common/Context.h \
../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h
GVertex.o: GVertex.cpp GVertex.h GEntity.h Range.h SPoint3.h \
SBoundingBox3d.h GPoint.h SPoint2.h GFace.h GEdgeLoop.h GEdge.h \
SVector3.h Pair.h MElement.h ../Common/GmshDefines.h MVertex.h MEdge.h \
- MFace.h ../Common/Message.h ../Numeric/FunctionSpace.h \
+ MFace.h ../Common/GmshMessage.h ../Numeric/FunctionSpace.h \
../Common/GmshMatrix.h
GEdge.o: GEdge.cpp GModel.h GVertex.h GEntity.h Range.h SPoint3.h \
SBoundingBox3d.h GPoint.h SPoint2.h GEdge.h SVector3.h GFace.h \
GEdgeLoop.h Pair.h GRegion.h MElement.h ../Common/GmshDefines.h \
- MVertex.h MEdge.h MFace.h ../Common/Message.h \
+ MVertex.h MEdge.h MFace.h ../Common/GmshMessage.h \
../Numeric/FunctionSpace.h ../Common/GmshMatrix.h \
../Numeric/GaussLegendre1D.h
GEdgeLoop.o: GEdgeLoop.cpp GEdgeLoop.h GEdge.h GEntity.h Range.h \
SPoint3.h SBoundingBox3d.h GVertex.h GPoint.h SPoint2.h SVector3.h \
- ../Common/Message.h
+ ../Common/GmshMessage.h
GFace.o: GFace.cpp GModel.h GVertex.h GEntity.h Range.h SPoint3.h \
SBoundingBox3d.h GPoint.h SPoint2.h GEdge.h SVector3.h GFace.h \
GEdgeLoop.h Pair.h GRegion.h MElement.h ../Common/GmshDefines.h \
- MVertex.h MEdge.h MFace.h ../Common/Message.h \
+ MVertex.h MEdge.h MFace.h ../Common/GmshMessage.h \
../Numeric/FunctionSpace.h ../Common/GmshMatrix.h \
../Common/VertexArray.h ../Geo/SVector3.h ../Numeric/Numeric.h \
../Numeric/NumericEmbedded.h ../Numeric/GaussLegendre1D.h \
@@ -105,18 +105,18 @@ GFaceCompound.o: GFaceCompound.cpp GFaceCompound.h Geo.h \
GEdgeLoop.h GEdge.h GVertex.h ../Numeric/gmshAssembler.h \
../Numeric/gmshLinearSystem.h ../Numeric/gmshLaplace.h \
../Numeric/gmshTermOfFormulation.h ../Common/GmshMatrix.h \
- ../Common/Gmsh.h ../Geo/GModel.h ../Geo/GVertex.h ../Geo/GEdge.h \
- ../Geo/GFace.h ../Geo/GRegion.h ../Geo/GEntity.h ../Geo/SPoint3.h \
- ../Geo/SBoundingBox3d.h ../Geo/MElement.h ../Geo/MVertex.h \
- ../Geo/SPoint3.h ../Geo/MEdge.h ../Geo/MVertex.h ../Geo/SVector3.h \
- ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h ../Common/Message.h \
- ../Numeric/FunctionSpace.h ../Common/Octree.h \
+ ../Common/Gmsh.h ../Common/GmshMessage.h ../Geo/GModel.h \
+ ../Geo/GVertex.h ../Geo/GEdge.h ../Geo/GFace.h ../Geo/GRegion.h \
+ ../Geo/GEntity.h ../Geo/SPoint3.h ../Geo/SBoundingBox3d.h \
+ ../Geo/MElement.h ../Geo/MVertex.h ../Geo/SPoint3.h ../Geo/MEdge.h \
+ ../Geo/MVertex.h ../Geo/SVector3.h ../Geo/MFace.h ../Geo/MVertex.h \
+ ../Geo/SVector3.h ../Numeric/FunctionSpace.h ../Common/Octree.h \
../Common/OctreeInternals.h ../Numeric/gmshLinearSystemGmm.h \
../Numeric/gmshLinearSystem.h
GRegion.o: GRegion.cpp GModel.h GVertex.h GEntity.h Range.h SPoint3.h \
SBoundingBox3d.h GPoint.h SPoint2.h GEdge.h SVector3.h GFace.h \
GEdgeLoop.h Pair.h GRegion.h MElement.h ../Common/GmshDefines.h \
- MVertex.h MEdge.h MFace.h ../Common/Message.h \
+ MVertex.h MEdge.h MFace.h ../Common/GmshMessage.h \
../Numeric/FunctionSpace.h ../Common/GmshMatrix.h
gmshVertex.o: gmshVertex.cpp GFace.h GEntity.h Range.h SPoint3.h \
SBoundingBox3d.h GPoint.h GEdgeLoop.h GEdge.h GVertex.h SPoint2.h \
@@ -124,7 +124,7 @@ gmshVertex.o: gmshVertex.cpp GFace.h GEntity.h Range.h SPoint3.h \
gmshSurface.h ../Numeric/Numeric.h ../Numeric/NumericEmbedded.h \
../Common/ListUtils.h ../Common/TreeUtils.h ../Common/avl.h \
../Common/ListUtils.h ExtrudeParams.h ../Common/SmoothData.h \
- GeoInterpolation.h ../Common/Message.h MVertex.h MElement.h MEdge.h \
+ GeoInterpolation.h ../Common/GmshMessage.h MVertex.h MElement.h MEdge.h \
MFace.h ../Numeric/FunctionSpace.h ../Common/GmshMatrix.h
gmshEdge.o: gmshEdge.cpp GModel.h GVertex.h GEntity.h Range.h SPoint3.h \
SBoundingBox3d.h GPoint.h SPoint2.h GEdge.h SVector3.h GFace.h \
@@ -133,7 +133,7 @@ gmshEdge.o: gmshEdge.cpp GModel.h GVertex.h GEntity.h Range.h SPoint3.h \
../Numeric/NumericEmbedded.h ../Common/ListUtils.h \
../Common/TreeUtils.h ../Common/avl.h ../Common/ListUtils.h \
ExtrudeParams.h ../Common/SmoothData.h gmshEdge.h GeoInterpolation.h \
- ../Common/Message.h ../Common/Context.h ../Geo/CGNSOptions.h \
+ ../Common/GmshMessage.h ../Common/Context.h ../Geo/CGNSOptions.h \
../Mesh/PartitionOptions.h
gmshFace.o: gmshFace.cpp GModel.h GVertex.h GEntity.h Range.h SPoint3.h \
SBoundingBox3d.h GPoint.h SPoint2.h GEdge.h SVector3.h GFace.h \
@@ -141,7 +141,7 @@ gmshFace.o: gmshFace.cpp GModel.h GVertex.h GEntity.h Range.h SPoint3.h \
gmshSurface.h ../Numeric/Numeric.h ../Numeric/NumericEmbedded.h \
../Common/ListUtils.h ../Common/TreeUtils.h ../Common/avl.h \
../Common/ListUtils.h ExtrudeParams.h ../Common/SmoothData.h \
- GeoInterpolation.h ../Common/Message.h ../Common/Context.h \
+ GeoInterpolation.h ../Common/GmshMessage.h ../Common/Context.h \
../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h
gmshRegion.o: gmshRegion.cpp GModel.h GVertex.h GEntity.h Range.h \
SPoint3.h SBoundingBox3d.h GPoint.h SPoint2.h GEdge.h SVector3.h \
@@ -149,41 +149,41 @@ gmshRegion.o: gmshRegion.cpp GModel.h GVertex.h GEntity.h Range.h \
../Common/GmshDefines.h gmshSurface.h ../Numeric/Numeric.h \
../Numeric/NumericEmbedded.h ../Common/ListUtils.h \
../Common/TreeUtils.h ../Common/avl.h ../Common/ListUtils.h \
- ExtrudeParams.h ../Common/SmoothData.h ../Common/Message.h
+ ExtrudeParams.h ../Common/SmoothData.h ../Common/GmshMessage.h
gmshSurface.o: gmshSurface.cpp gmshSurface.h Pair.h Range.h SPoint2.h \
SPoint3.h SVector3.h SBoundingBox3d.h ../Numeric/Numeric.h \
- ../Numeric/NumericEmbedded.h ../Common/Message.h
+ ../Numeric/NumericEmbedded.h ../Common/GmshMessage.h
OCCVertex.o: OCCVertex.cpp GModel.h GVertex.h GEntity.h Range.h SPoint3.h \
SBoundingBox3d.h GPoint.h SPoint2.h GEdge.h SVector3.h GFace.h \
GEdgeLoop.h Pair.h GRegion.h MVertex.h MElement.h \
- ../Common/GmshDefines.h MEdge.h MFace.h ../Common/Message.h \
+ ../Common/GmshDefines.h MEdge.h MFace.h ../Common/GmshMessage.h \
../Numeric/FunctionSpace.h ../Common/GmshMatrix.h OCCVertex.h \
OCCIncludes.h OCCEdge.h OCCFace.h
OCCEdge.o: OCCEdge.cpp GModel.h GVertex.h GEntity.h Range.h SPoint3.h \
SBoundingBox3d.h GPoint.h SPoint2.h GEdge.h SVector3.h GFace.h \
- GEdgeLoop.h Pair.h GRegion.h ../Common/Message.h OCCEdge.h OCCVertex.h \
- OCCIncludes.h OCCFace.h ../Common/Context.h ../Geo/CGNSOptions.h \
- ../Mesh/PartitionOptions.h
+ GEdgeLoop.h Pair.h GRegion.h ../Common/GmshMessage.h OCCEdge.h \
+ OCCVertex.h OCCIncludes.h OCCFace.h ../Common/Context.h \
+ ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h
OCCFace.o: OCCFace.cpp GModel.h GVertex.h GEntity.h Range.h SPoint3.h \
SBoundingBox3d.h GPoint.h SPoint2.h GEdge.h SVector3.h GFace.h \
GEdgeLoop.h Pair.h GRegion.h OCCVertex.h OCCIncludes.h OCCEdge.h \
- OCCFace.h ../Common/Message.h ../Numeric/Numeric.h \
+ OCCFace.h ../Common/GmshMessage.h ../Numeric/Numeric.h \
../Numeric/NumericEmbedded.h ../Common/VertexArray.h ../Geo/SVector3.h \
../Common/Context.h ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h
OCCRegion.o: OCCRegion.cpp GModel.h GVertex.h GEntity.h Range.h SPoint3.h \
SBoundingBox3d.h GPoint.h SPoint2.h GEdge.h SVector3.h GFace.h \
GEdgeLoop.h Pair.h GRegion.h OCCVertex.h OCCIncludes.h OCCEdge.h \
- OCCFace.h OCCRegion.h ../Common/Message.h
+ OCCFace.h OCCRegion.h ../Common/GmshMessage.h
discreteEdge.o: discreteEdge.cpp discreteEdge.h GModel.h GVertex.h \
GEntity.h Range.h SPoint3.h SBoundingBox3d.h GPoint.h SPoint2.h GEdge.h \
- SVector3.h GFace.h GEdgeLoop.h Pair.h GRegion.h ../Common/Message.h \
+ SVector3.h GFace.h GEdgeLoop.h Pair.h GRegion.h ../Common/GmshMessage.h \
Geo.h ../Common/GmshDefines.h gmshSurface.h ../Numeric/Numeric.h \
../Numeric/NumericEmbedded.h ../Common/ListUtils.h \
../Common/TreeUtils.h ../Common/avl.h ../Common/ListUtils.h \
ExtrudeParams.h ../Common/SmoothData.h
discreteFace.o: discreteFace.cpp discreteFace.h GModel.h GVertex.h \
GEntity.h Range.h SPoint3.h SBoundingBox3d.h GPoint.h SPoint2.h GEdge.h \
- SVector3.h GFace.h GEdgeLoop.h Pair.h GRegion.h ../Common/Message.h \
+ SVector3.h GFace.h GEdgeLoop.h Pair.h GRegion.h ../Common/GmshMessage.h \
Geo.h ../Common/GmshDefines.h gmshSurface.h ../Numeric/Numeric.h \
../Numeric/NumericEmbedded.h ../Common/ListUtils.h \
../Common/TreeUtils.h ../Common/avl.h ../Common/ListUtils.h \
@@ -202,7 +202,7 @@ fourierEdge.o: fourierEdge.cpp fourierEdge.h GEdge.h GEntity.h Range.h \
fourierFace.o: fourierFace.cpp fourierVertex.h GModel.h GVertex.h \
GEntity.h Range.h SPoint3.h SBoundingBox3d.h GPoint.h SPoint2.h GEdge.h \
SVector3.h GFace.h GEdgeLoop.h Pair.h GRegion.h MVertex.h fourierFace.h \
- fourierEdge.h ../Common/Message.h
+ fourierEdge.h ../Common/GmshMessage.h
fourierProjectionFace.o: fourierProjectionFace.cpp \
fourierProjectionFace.h GModel.h GVertex.h GEntity.h Range.h SPoint3.h \
SBoundingBox3d.h GPoint.h SPoint2.h GEdge.h SVector3.h GFace.h \
@@ -210,7 +210,7 @@ fourierProjectionFace.o: fourierProjectionFace.cpp \
GModel.o: GModel.cpp GModel.h GVertex.h GEntity.h Range.h SPoint3.h \
SBoundingBox3d.h GPoint.h SPoint2.h GEdge.h SVector3.h GFace.h \
GEdgeLoop.h Pair.h GRegion.h MElement.h ../Common/GmshDefines.h \
- MVertex.h MEdge.h MFace.h ../Common/Message.h \
+ MVertex.h MEdge.h MFace.h ../Common/GmshMessage.h \
../Numeric/FunctionSpace.h ../Common/GmshMatrix.h discreteRegion.h \
discreteFace.h discreteEdge.h discreteVertex.h gmshSurface.h \
../Numeric/Numeric.h ../Numeric/NumericEmbedded.h ../Common/Octree.h \
@@ -223,40 +223,41 @@ GModelIO_Geo.o: GModelIO_Geo.cpp GModel.h GVertex.h GEntity.h Range.h \
gmshSurface.h ../Numeric/Numeric.h ../Numeric/NumericEmbedded.h \
../Common/ListUtils.h ../Common/TreeUtils.h ../Common/avl.h \
../Common/ListUtils.h ExtrudeParams.h ../Common/SmoothData.h \
- ../Common/OpenFile.h ../Common/Message.h gmshVertex.h gmshFace.h \
+ ../Common/OpenFile.h ../Common/GmshMessage.h gmshVertex.h gmshFace.h \
GFaceCompound.h gmshEdge.h gmshRegion.h ../Mesh/Field.h ../Post/PView.h \
../Geo/SPoint3.h ../Parser/Parser.h
GModelIO_Mesh.o: GModelIO_Mesh.cpp GModel.h GVertex.h GEntity.h Range.h \
SPoint3.h SBoundingBox3d.h GPoint.h SPoint2.h GEdge.h SVector3.h \
GFace.h GEdgeLoop.h Pair.h GRegion.h ../Common/GmshDefines.h MElement.h \
- MVertex.h MEdge.h MFace.h ../Common/Message.h \
+ MVertex.h MEdge.h MFace.h ../Common/GmshMessage.h \
../Numeric/FunctionSpace.h ../Common/GmshMatrix.h discreteRegion.h \
discreteFace.h ../Common/StringUtils.h
GModelIO_OCC.o: GModelIO_OCC.cpp GModelIO_OCC.h GModel.h GVertex.h \
GEntity.h Range.h SPoint3.h SBoundingBox3d.h GPoint.h SPoint2.h GEdge.h \
SVector3.h GFace.h GEdgeLoop.h Pair.h GRegion.h OCCIncludes.h \
- ../Common/Message.h ../Common/Context.h ../Geo/CGNSOptions.h \
+ ../Common/GmshMessage.h ../Common/Context.h ../Geo/CGNSOptions.h \
../Mesh/PartitionOptions.h OCCVertex.h OCCEdge.h OCCFace.h OCCRegion.h \
MElement.h ../Common/GmshDefines.h MVertex.h MEdge.h MFace.h \
../Numeric/FunctionSpace.h ../Common/GmshMatrix.h ../Common/OpenFile.h
GModelIO_Fourier.o: GModelIO_Fourier.cpp GModel.h GVertex.h GEntity.h \
Range.h SPoint3.h SBoundingBox3d.h GPoint.h SPoint2.h GEdge.h \
- SVector3.h GFace.h GEdgeLoop.h Pair.h GRegion.h ../Common/Message.h \
+ SVector3.h GFace.h GEdgeLoop.h Pair.h GRegion.h ../Common/GmshMessage.h \
fourierVertex.h MVertex.h fourierEdge.h fourierFace.h \
GModelIO_Fourier.h
GModelIO_CGNS.o: GModelIO_CGNS.cpp GModel.h GVertex.h GEntity.h Range.h \
SPoint3.h SBoundingBox3d.h GPoint.h SPoint2.h GEdge.h SVector3.h \
- GFace.h GEdgeLoop.h Pair.h GRegion.h ../Common/Message.h CGNSOptions.h
+ GFace.h GEdgeLoop.h Pair.h GRegion.h ../Common/GmshMessage.h \
+ CGNSOptions.h
GModelIO_MED.o: GModelIO_MED.cpp GModel.h GVertex.h GEntity.h Range.h \
SPoint3.h SBoundingBox3d.h GPoint.h SPoint2.h GEdge.h SVector3.h \
- GFace.h GEdgeLoop.h Pair.h GRegion.h ../Common/Message.h
-ExtrudeParams.o: ExtrudeParams.cpp ../Common/Message.h Geo.h \
+ GFace.h GEdgeLoop.h Pair.h GRegion.h ../Common/GmshMessage.h
+ExtrudeParams.o: ExtrudeParams.cpp ../Common/GmshMessage.h Geo.h \
../Common/GmshDefines.h gmshSurface.h Pair.h Range.h SPoint2.h \
SPoint3.h SVector3.h SBoundingBox3d.h ../Numeric/Numeric.h \
../Numeric/NumericEmbedded.h ../Common/ListUtils.h \
../Common/TreeUtils.h ../Common/avl.h ../Common/ListUtils.h \
ExtrudeParams.h ../Common/SmoothData.h
-Geo.o: Geo.cpp ../Common/Message.h ../Numeric/Numeric.h \
+Geo.o: Geo.cpp ../Common/GmshMessage.h ../Numeric/Numeric.h \
../Numeric/NumericEmbedded.h ../Common/MallocUtils.h Geo.h \
../Common/GmshDefines.h gmshSurface.h Pair.h Range.h SPoint2.h \
SPoint3.h SVector3.h SBoundingBox3d.h ../Common/ListUtils.h \
@@ -265,7 +266,7 @@ Geo.o: Geo.cpp ../Common/Message.h ../Numeric/Numeric.h \
GPoint.h GEdge.h GFace.h GEdgeLoop.h GRegion.h GeoInterpolation.h \
../Mesh/Field.h ../Post/PView.h ../Geo/SPoint3.h ../Common/Context.h \
../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h
-GeoStringInterface.o: GeoStringInterface.cpp ../Common/Message.h \
+GeoStringInterface.o: GeoStringInterface.cpp ../Common/GmshMessage.h \
../Numeric/Numeric.h ../Numeric/NumericEmbedded.h \
../Common/StringUtils.h Geo.h ../Common/GmshDefines.h gmshSurface.h \
Pair.h Range.h SPoint2.h SPoint3.h SVector3.h SBoundingBox3d.h \
@@ -275,14 +276,14 @@ GeoStringInterface.o: GeoStringInterface.cpp ../Common/Message.h \
../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h GModel.h GVertex.h \
GEntity.h GPoint.h GEdge.h GFace.h GEdgeLoop.h GRegion.h \
../Parser/Parser.h
-GeoInterpolation.o: GeoInterpolation.cpp ../Common/Message.h Geo.h \
+GeoInterpolation.o: GeoInterpolation.cpp ../Common/GmshMessage.h Geo.h \
../Common/GmshDefines.h gmshSurface.h Pair.h Range.h SPoint2.h \
SPoint3.h SVector3.h SBoundingBox3d.h ../Numeric/Numeric.h \
../Numeric/NumericEmbedded.h ../Common/ListUtils.h \
../Common/TreeUtils.h ../Common/avl.h ../Common/ListUtils.h \
ExtrudeParams.h ../Common/SmoothData.h GeoInterpolation.h \
GeoStringInterface.h
-findLinks.o: findLinks.cpp ../Common/Message.h GModel.h GVertex.h \
+findLinks.o: findLinks.cpp ../Common/GmshMessage.h GModel.h GVertex.h \
GEntity.h Range.h SPoint3.h SBoundingBox3d.h GPoint.h SPoint2.h GEdge.h \
SVector3.h GFace.h GEdgeLoop.h Pair.h GRegion.h ../Common/TreeUtils.h \
../Common/avl.h ../Common/ListUtils.h
@@ -292,32 +293,35 @@ MVertex.o: MVertex.cpp MVertex.h SPoint3.h GEdge.h GEntity.h Range.h \
gmshSurface.h ../Numeric/Numeric.h ../Numeric/NumericEmbedded.h \
../Common/ListUtils.h ../Common/TreeUtils.h ../Common/avl.h \
../Common/ListUtils.h ExtrudeParams.h ../Common/SmoothData.h \
- ../Common/Message.h ../Common/StringUtils.h
+ ../Common/GmshMessage.h ../Common/StringUtils.h
GaussQuadratureTri.o: GaussQuadratureTri.cpp MElement.h \
../Common/GmshDefines.h MVertex.h SPoint3.h MEdge.h SVector3.h MFace.h \
- ../Common/Message.h ../Numeric/FunctionSpace.h ../Common/GmshMatrix.h \
- GaussLegendreSimplex.h
+ ../Common/GmshMessage.h ../Numeric/FunctionSpace.h \
+ ../Common/GmshMatrix.h GaussLegendreSimplex.h
GaussQuadratureQuad.o: GaussQuadratureQuad.cpp MElement.h \
../Common/GmshDefines.h MVertex.h SPoint3.h MEdge.h SVector3.h MFace.h \
- ../Common/Message.h ../Numeric/FunctionSpace.h ../Common/GmshMatrix.h \
- GaussLegendreSimplex.h ../Numeric/GaussLegendre1D.h
+ ../Common/GmshMessage.h ../Numeric/FunctionSpace.h \
+ ../Common/GmshMatrix.h GaussLegendreSimplex.h \
+ ../Numeric/GaussLegendre1D.h
GaussQuadratureTet.o: GaussQuadratureTet.cpp MElement.h \
../Common/GmshDefines.h MVertex.h SPoint3.h MEdge.h SVector3.h MFace.h \
- ../Common/Message.h ../Numeric/FunctionSpace.h ../Common/GmshMatrix.h \
- GaussLegendreSimplex.h
+ ../Common/GmshMessage.h ../Numeric/FunctionSpace.h \
+ ../Common/GmshMatrix.h GaussLegendreSimplex.h
GaussQuadratureHex.o: GaussQuadratureHex.cpp MElement.h \
../Common/GmshDefines.h MVertex.h SPoint3.h MEdge.h SVector3.h MFace.h \
- ../Common/Message.h ../Numeric/FunctionSpace.h ../Common/GmshMatrix.h \
- GaussLegendreSimplex.h ../Numeric/GaussLegendre1D.h
+ ../Common/GmshMessage.h ../Numeric/FunctionSpace.h \
+ ../Common/GmshMatrix.h GaussLegendreSimplex.h \
+ ../Numeric/GaussLegendre1D.h
GaussLegendreSimplex.o: GaussLegendreSimplex.cpp MElement.h \
../Common/GmshDefines.h MVertex.h SPoint3.h MEdge.h SVector3.h MFace.h \
- ../Common/Message.h ../Numeric/FunctionSpace.h ../Common/GmshMatrix.h \
- GaussLegendreSimplex.h ../Numeric/GaussLegendre1D.h
+ ../Common/GmshMessage.h ../Numeric/FunctionSpace.h \
+ ../Common/GmshMatrix.h GaussLegendreSimplex.h \
+ ../Numeric/GaussLegendre1D.h
MFace.o: MFace.cpp MFace.h MVertex.h SPoint3.h SVector3.h \
../Numeric/Numeric.h ../Numeric/NumericEmbedded.h ../Common/Context.h \
../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h
MElement.o: MElement.cpp MElement.h ../Common/GmshDefines.h MVertex.h \
- SPoint3.h MEdge.h SVector3.h MFace.h ../Common/Message.h \
+ SPoint3.h MEdge.h SVector3.h MFace.h ../Common/GmshMessage.h \
../Numeric/FunctionSpace.h ../Common/GmshMatrix.h GEntity.h Range.h \
SBoundingBox3d.h GFace.h GPoint.h GEdgeLoop.h GEdge.h GVertex.h \
SPoint2.h Pair.h ../Common/StringUtils.h ../Numeric/Numeric.h \
diff --git a/Geo/OCCEdge.cpp b/Geo/OCCEdge.cpp
index bdff7037ac..391e5a032f 100644
--- a/Geo/OCCEdge.cpp
+++ b/Geo/OCCEdge.cpp
@@ -5,7 +5,7 @@
#include <limits>
#include "GModel.h"
-#include "Message.h"
+#include "GmshMessage.h"
#include "OCCEdge.h"
#include "OCCFace.h"
#include "Context.h"
diff --git a/Geo/OCCFace.cpp b/Geo/OCCFace.cpp
index 3cf99a6c2e..96d6d7497a 100644
--- a/Geo/OCCFace.cpp
+++ b/Geo/OCCFace.cpp
@@ -8,7 +8,7 @@
#include "OCCVertex.h"
#include "OCCEdge.h"
#include "OCCFace.h"
-#include "Message.h"
+#include "GmshMessage.h"
#include "Numeric.h"
#include "VertexArray.h"
#include "Context.h"
diff --git a/Geo/OCCRegion.cpp b/Geo/OCCRegion.cpp
index 7ed5de97d6..0b05d257f3 100644
--- a/Geo/OCCRegion.cpp
+++ b/Geo/OCCRegion.cpp
@@ -8,7 +8,7 @@
#include "OCCEdge.h"
#include "OCCFace.h"
#include "OCCRegion.h"
-#include "Message.h"
+#include "GmshMessage.h"
#if defined(HAVE_OCC)
diff --git a/Geo/discreteEdge.cpp b/Geo/discreteEdge.cpp
index ebc325363b..28b5fc15f8 100644
--- a/Geo/discreteEdge.cpp
+++ b/Geo/discreteEdge.cpp
@@ -4,7 +4,7 @@
// bugs and problems to <gmsh@geuz.org>.
#include "discreteEdge.h"
-#include "Message.h"
+#include "GmshMessage.h"
#if !defined(HAVE_GMSH_EMBEDDED)
#include "Geo.h"
diff --git a/Geo/discreteFace.cpp b/Geo/discreteFace.cpp
index c80b0f0dd5..0a9879ba2d 100644
--- a/Geo/discreteFace.cpp
+++ b/Geo/discreteFace.cpp
@@ -4,7 +4,7 @@
// bugs and problems to <gmsh@geuz.org>.
#include "discreteFace.h"
-#include "Message.h"
+#include "GmshMessage.h"
#if !defined(HAVE_GMSH_EMBEDDED)
#include "Geo.h"
diff --git a/Geo/findLinks.cpp b/Geo/findLinks.cpp
index c832aa22aa..14427756d4 100644
--- a/Geo/findLinks.cpp
+++ b/Geo/findLinks.cpp
@@ -4,7 +4,7 @@
// bugs and problems to <gmsh@geuz.org>.
#include <stdlib.h>
-#include "Message.h"
+#include "GmshMessage.h"
#include "GModel.h"
#include "TreeUtils.h"
#include "ListUtils.h"
diff --git a/Geo/fourierFace.cpp b/Geo/fourierFace.cpp
index 63662e7b0d..2ec18e866d 100644
--- a/Geo/fourierFace.cpp
+++ b/Geo/fourierFace.cpp
@@ -5,7 +5,7 @@
#include <list>
#include "fourierVertex.h"
#include "fourierFace.h"
-#include "Message.h"
+#include "GmshMessage.h"
#if defined(HAVE_FOURIER_MODEL)
diff --git a/Geo/gmshEdge.cpp b/Geo/gmshEdge.cpp
index b8bf5ba521..760520d1fc 100644
--- a/Geo/gmshEdge.cpp
+++ b/Geo/gmshEdge.cpp
@@ -9,7 +9,7 @@
#include "gmshEdge.h"
#include "Geo.h"
#include "GeoInterpolation.h"
-#include "Message.h"
+#include "GmshMessage.h"
#include "Context.h"
extern Context_T CTX;
diff --git a/Geo/gmshFace.cpp b/Geo/gmshFace.cpp
index 999b6732ef..9094059d3c 100644
--- a/Geo/gmshFace.cpp
+++ b/Geo/gmshFace.cpp
@@ -9,7 +9,7 @@
#include "Geo.h"
#include "GeoInterpolation.h"
#include "Numeric.h"
-#include "Message.h"
+#include "GmshMessage.h"
#include "Context.h"
extern Context_T CTX;
diff --git a/Geo/gmshRegion.cpp b/Geo/gmshRegion.cpp
index e813ba9202..a1718fdb5c 100644
--- a/Geo/gmshRegion.cpp
+++ b/Geo/gmshRegion.cpp
@@ -7,7 +7,7 @@
#include "GModel.h"
#include "gmshRegion.h"
#include "Geo.h"
-#include "Message.h"
+#include "GmshMessage.h"
gmshRegion::gmshRegion(GModel *m, ::Volume *volume)
: GRegion(m, volume->Num), v(volume)
diff --git a/Geo/gmshSurface.cpp b/Geo/gmshSurface.cpp
index 769d7e1bd0..8936e3a6bb 100644
--- a/Geo/gmshSurface.cpp
+++ b/Geo/gmshSurface.cpp
@@ -4,7 +4,7 @@
// bugs and problems to <gmsh@geuz.org>.
#include "gmshSurface.h"
-#include "Message.h"
+#include "GmshMessage.h"
#if defined(HAVE_MATH_EVAL)
#include "matheval.h"
#endif
diff --git a/Geo/gmshVertex.cpp b/Geo/gmshVertex.cpp
index 99f5d889ba..5c13f2bed4 100644
--- a/Geo/gmshVertex.cpp
+++ b/Geo/gmshVertex.cpp
@@ -8,7 +8,7 @@
#include "gmshVertex.h"
#include "Geo.h"
#include "GeoInterpolation.h"
-#include "Message.h"
+#include "GmshMessage.h"
#include "MVertex.h"
#include "MElement.h"
diff --git a/Graphics/Draw.cpp b/Graphics/Draw.cpp
index 51b7e8337e..51e0f0652a 100644
--- a/Graphics/Draw.cpp
+++ b/Graphics/Draw.cpp
@@ -5,7 +5,7 @@
#include "GmshUI.h"
#include "GmshDefines.h"
-#include "Message.h"
+#include "GmshMessage.h"
#include "Draw.h"
#include "Context.h"
#include "Numeric.h"
diff --git a/Graphics/Makefile b/Graphics/Makefile
index fedfd4320a..7114f5e54b 100644
--- a/Graphics/Makefile
+++ b/Graphics/Makefile
@@ -59,7 +59,7 @@ depend:
# DO NOT DELETE THIS LINE
Draw.o: Draw.cpp ../Common/GmshUI.h ../Common/GmshDefines.h \
- ../Common/Message.h Draw.h ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h \
+ ../Common/GmshMessage.h Draw.h ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h \
../Common/Context.h ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h \
../Numeric/Numeric.h ../Numeric/NumericEmbedded.h ../Geo/GModel.h \
../Geo/GVertex.h ../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \
@@ -70,14 +70,14 @@ Draw.o: Draw.cpp ../Common/GmshUI.h ../Common/GmshDefines.h \
../Geo/SVector3.h ../Geo/Pair.h ../Geo/GRegion.h ../Geo/GEntity.h \
../Geo/SPoint3.h ../Geo/SBoundingBox3d.h ../Post/PView.h \
../Post/PViewOptions.h ../Post/ColorTable.h
-Mesh.o: Mesh.cpp ../Common/Message.h ../Common/GmshUI.h ../Geo/GModel.h \
- ../Geo/GVertex.h ../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \
- ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Geo/GPoint.h \
- ../Geo/SPoint2.h ../Geo/GEdge.h ../Geo/GEntity.h ../Geo/GVertex.h \
- ../Geo/SVector3.h ../Geo/SPoint3.h ../Geo/SPoint3.h ../Geo/SPoint2.h \
- ../Geo/GFace.h ../Geo/GEntity.h ../Geo/GPoint.h ../Geo/GEdgeLoop.h \
- ../Geo/GEdge.h ../Geo/SPoint2.h ../Geo/SVector3.h ../Geo/Pair.h \
- ../Geo/GRegion.h ../Geo/GEntity.h ../Geo/SPoint3.h \
+Mesh.o: Mesh.cpp ../Common/GmshMessage.h ../Common/GmshUI.h \
+ ../Geo/GModel.h ../Geo/GVertex.h ../Geo/GEntity.h ../Geo/Range.h \
+ ../Geo/SPoint3.h ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h \
+ ../Geo/GPoint.h ../Geo/SPoint2.h ../Geo/GEdge.h ../Geo/GEntity.h \
+ ../Geo/GVertex.h ../Geo/SVector3.h ../Geo/SPoint3.h ../Geo/SPoint3.h \
+ ../Geo/SPoint2.h ../Geo/GFace.h ../Geo/GEntity.h ../Geo/GPoint.h \
+ ../Geo/GEdgeLoop.h ../Geo/GEdge.h ../Geo/SPoint2.h ../Geo/SVector3.h \
+ ../Geo/Pair.h ../Geo/GRegion.h ../Geo/GEntity.h ../Geo/SPoint3.h \
../Geo/SBoundingBox3d.h ../Geo/MElement.h ../Common/GmshDefines.h \
../Geo/MVertex.h ../Geo/SPoint3.h ../Geo/MEdge.h ../Geo/MVertex.h \
../Geo/SVector3.h ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h \
@@ -96,16 +96,16 @@ Geom.o: Geom.cpp ../Common/GmshUI.h Draw.h ../Geo/SBoundingBox3d.h \
../Geo/GEdgeLoop.h ../Geo/GEdge.h ../Geo/SPoint2.h ../Geo/SVector3.h \
../Geo/Pair.h ../Geo/GRegion.h ../Geo/GEntity.h ../Geo/SPoint3.h \
../Geo/SBoundingBox3d.h
-Post.o: Post.cpp ../Common/Message.h ../Common/GmshUI.h \
+Post.o: Post.cpp ../Common/GmshMessage.h ../Common/GmshUI.h \
../Numeric/Numeric.h ../Numeric/NumericEmbedded.h Draw.h \
../Geo/SBoundingBox3d.h ../Geo/SPoint3.h Iso.h ../Post/PView.h \
../Post/PViewOptions.h ../Post/ColorTable.h ../Post/PViewData.h \
../Common/VertexArray.h ../Geo/SVector3.h ../Geo/SPoint3.h \
../Common/SmoothData.h ../Common/Context.h ../Geo/CGNSOptions.h \
../Mesh/PartitionOptions.h gl2ps.h
-SelectBuffer.o: SelectBuffer.cpp ../Common/Message.h ../Common/GmshUI.h \
- ../Common/GmshDefines.h ../Geo/GModel.h ../Geo/GVertex.h \
- ../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \
+SelectBuffer.o: SelectBuffer.cpp ../Common/GmshMessage.h \
+ ../Common/GmshUI.h ../Common/GmshDefines.h ../Geo/GModel.h \
+ ../Geo/GVertex.h ../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \
../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Geo/GPoint.h \
../Geo/SPoint2.h ../Geo/GEdge.h ../Geo/GEntity.h ../Geo/GVertex.h \
../Geo/SVector3.h ../Geo/SPoint3.h ../Geo/SPoint3.h ../Geo/SPoint2.h \
@@ -123,10 +123,10 @@ Entity.o: Entity.cpp ../Common/GmshUI.h ../Numeric/Numeric.h \
../Numeric/NumericEmbedded.h Draw.h ../Geo/SBoundingBox3d.h \
../Geo/SPoint3.h ../Common/Context.h ../Geo/CGNSOptions.h \
../Mesh/PartitionOptions.h gl2ps.h
-ReadImg.o: ReadImg.cpp ReadImg.h ../Common/Message.h ../Common/GmshUI.h \
- ../Post/PView.h ../Geo/SPoint3.h ../Post/PViewDataList.h \
- ../Post/PViewData.h ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h \
- ../Common/ListUtils.h
+ReadImg.o: ReadImg.cpp ReadImg.h ../Common/GmshMessage.h \
+ ../Common/GmshUI.h ../Post/PView.h ../Geo/SPoint3.h \
+ ../Post/PViewDataList.h ../Post/PViewData.h ../Geo/SBoundingBox3d.h \
+ ../Geo/SPoint3.h ../Common/ListUtils.h
Axes.o: Axes.cpp ../Common/GmshUI.h Draw.h ../Geo/SBoundingBox3d.h \
../Geo/SPoint3.h ../Common/Context.h ../Geo/CGNSOptions.h \
../Mesh/PartitionOptions.h gl2ps.h ../Geo/GModel.h ../Geo/GVertex.h \
@@ -148,17 +148,17 @@ Graph2D.o: Graph2D.cpp ../Common/GmshUI.h Draw.h ../Geo/SBoundingBox3d.h \
../Numeric/NumericEmbedded.h
gl2ps.o: gl2ps.cpp gl2ps.h
gl2gif.o: gl2gif.cpp ../Common/MallocUtils.h gl2gif.h PixelBuffer.h \
- ../Common/GmshUI.h ../Common/Message.h Draw.h ../Geo/SBoundingBox3d.h \
- ../Geo/SPoint3.h
+ ../Common/GmshUI.h ../Common/GmshMessage.h Draw.h \
+ ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h
gl2jpeg.o: gl2jpeg.cpp gl2jpeg.h PixelBuffer.h ../Common/GmshUI.h \
- ../Common/Message.h ../Common/MallocUtils.h Draw.h \
+ ../Common/GmshMessage.h ../Common/MallocUtils.h Draw.h \
../Geo/SBoundingBox3d.h ../Geo/SPoint3.h
gl2png.o: gl2png.cpp gl2png.h PixelBuffer.h ../Common/GmshUI.h \
- ../Common/Message.h ../Common/MallocUtils.h Draw.h \
+ ../Common/GmshMessage.h ../Common/MallocUtils.h Draw.h \
../Geo/SBoundingBox3d.h ../Geo/SPoint3.h
gl2ppm.o: gl2ppm.cpp gl2ppm.h PixelBuffer.h ../Common/GmshUI.h \
- ../Common/Message.h ../Common/MallocUtils.h Draw.h \
+ ../Common/GmshMessage.h ../Common/MallocUtils.h Draw.h \
../Geo/SBoundingBox3d.h ../Geo/SPoint3.h
gl2yuv.o: gl2yuv.cpp ../Common/MallocUtils.h gl2yuv.h PixelBuffer.h \
- ../Common/GmshUI.h ../Common/Message.h Draw.h ../Geo/SBoundingBox3d.h \
- ../Geo/SPoint3.h
+ ../Common/GmshUI.h ../Common/GmshMessage.h Draw.h \
+ ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h
diff --git a/Graphics/Mesh.cpp b/Graphics/Mesh.cpp
index 05ddc10a34..ada2c1aba8 100644
--- a/Graphics/Mesh.cpp
+++ b/Graphics/Mesh.cpp
@@ -4,7 +4,7 @@
// bugs and problems to <gmsh@geuz.org>.
#include <math.h>
-#include "Message.h"
+#include "GmshMessage.h"
#include "GmshUI.h"
#include "GModel.h"
#include "MElement.h"
diff --git a/Graphics/PixelBuffer.h b/Graphics/PixelBuffer.h
index 7218302258..c74f2e4de0 100644
--- a/Graphics/PixelBuffer.h
+++ b/Graphics/PixelBuffer.h
@@ -7,7 +7,7 @@
#define _PIXEL_BUFFER_H_
#include "GmshUI.h"
-#include "Message.h"
+#include "GmshMessage.h"
#include "MallocUtils.h"
#include "Draw.h"
diff --git a/Graphics/Post.cpp b/Graphics/Post.cpp
index a8c37225ef..992ac18830 100644
--- a/Graphics/Post.cpp
+++ b/Graphics/Post.cpp
@@ -5,7 +5,7 @@
#include <math.h>
#include <algorithm>
-#include "Message.h"
+#include "GmshMessage.h"
#include "GmshUI.h"
#include "Numeric.h"
#include "Draw.h"
diff --git a/Graphics/ReadImg.cpp b/Graphics/ReadImg.cpp
index 2a5ff9e5ce..fe7438fae8 100644
--- a/Graphics/ReadImg.cpp
+++ b/Graphics/ReadImg.cpp
@@ -5,7 +5,7 @@
#include <string.h>
#include "ReadImg.h"
-#include "Message.h"
+#include "GmshMessage.h"
#include "GmshUI.h"
#include "PView.h"
#include "PViewDataList.h"
diff --git a/Graphics/SelectBuffer.cpp b/Graphics/SelectBuffer.cpp
index 142c529db7..0d11044a5c 100644
--- a/Graphics/SelectBuffer.cpp
+++ b/Graphics/SelectBuffer.cpp
@@ -3,7 +3,7 @@
// See the LICENSE.txt file for license information. Please report all
// bugs and problems to <gmsh@geuz.org>.
-#include "Message.h"
+#include "GmshMessage.h"
#include "GmshUI.h"
#include "GmshDefines.h"
#include "GModel.h"
diff --git a/Makefile b/Makefile
index 590e913630..f3471989d7 100644
--- a/Makefile
+++ b/Makefile
@@ -22,9 +22,9 @@ GMSH_API = Geo/GModel.h Geo/GEntity.h Geo/GPoint.h\
Geo/MVertex.h Geo/MEdge.h Geo/MFace.h Geo/MElement.h\
Geo/discreteVertex.h Geo/discreteEdge.h Geo/discreteFace.h Geo/discreteRegion.h\
Geo/SPoint2.h Geo/SPoint3.h Geo/SVector3.h Geo/SBoundingBox3d.h\
- Geo/Pair.h Geo/Range.h\
+ Geo/Pair.h Geo/Range.h Numeric/FunctionSpace.h\
Post/PView.h Post/PViewData.h Plugin/PluginManager.h\
- Common/VertexArray.h Common/Message.h\
+ Common/VertexArray.h Common/GmshMessage.h\
Common/Gmsh.h Common/GmshDefines.h Common/GmshVersion.h Common/GmshMatrix.h
GMSH_EMBEDDED = ${GMSH_API} Geo/discrete*.cpp\
@@ -33,7 +33,7 @@ GMSH_EMBEDDED = ${GMSH_API} Geo/discrete*.cpp\
Geo/GEdgeLoop.cpp Geo/GFace.cpp Geo/GRegion.cpp\
Geo/MElement.cpp Geo/MFace.cpp Geo/MVertex.cpp\
Common/StringUtils.{cpp,h}\
- Numeric/NumericEmbedded.{cpp,h} Numeric/FunctionSpace.{cpp,h}\
+ Numeric/NumericEmbedded.{cpp,h} Numeric/FunctionSpace.cpp\
utils/embed/GmshEmbedded.{cpp,h} utils/embed/Makefile
# Main building rules
@@ -116,7 +116,6 @@ uninstall-lib:
embed:
@if [ -r ../getdp/contrib/gmsh/Makefile ]; then \
rsync -av ${GMSH_EMBEDDED} ../getdp/contrib/gmsh;\
- rm -f ../getdp/contrib/gmsh/Message.h;\
fi
# Macintosh-specific rules
diff --git a/Mesh/BDS.cpp b/Mesh/BDS.cpp
index 4104574066..197c36d95d 100644
--- a/Mesh/BDS.cpp
+++ b/Mesh/BDS.cpp
@@ -7,7 +7,7 @@
#include <stdio.h>
#include "Numeric.h"
#include "BDS.h"
-#include "Message.h"
+#include "GmshMessage.h"
#include "GFace.h"
#include "meshGFaceDelaunayInsertion.h"
#include "qualityMeasures.h"
diff --git a/Mesh/BDS.h b/Mesh/BDS.h
index 25bdb3e762..f5f1501cae 100644
--- a/Mesh/BDS.h
+++ b/Mesh/BDS.h
@@ -19,7 +19,7 @@
#include <math.h>
#include "GFace.h"
#include "PView.h"
-#include "Message.h"
+#include "GmshMessage.h"
class BDS_Edge;
class BDS_Face;
diff --git a/Mesh/BackgroundMesh.cpp b/Mesh/BackgroundMesh.cpp
index 7851be3552..ca27b04d5a 100644
--- a/Mesh/BackgroundMesh.cpp
+++ b/Mesh/BackgroundMesh.cpp
@@ -3,7 +3,7 @@
// See the LICENSE.txt file for license information. Please report all
// bugs and problems to <gmsh@geuz.org>.
-#include "Message.h"
+#include "GmshMessage.h"
#include "BackgroundMesh.h"
#include "Numeric.h"
#include "Context.h"
diff --git a/Mesh/BoundaryLayers.cpp b/Mesh/BoundaryLayers.cpp
index f3127caf4d..f874c3124e 100644
--- a/Mesh/BoundaryLayers.cpp
+++ b/Mesh/BoundaryLayers.cpp
@@ -9,7 +9,7 @@
#include "ExtrudeParams.h"
#include "meshGEdge.h"
#include "meshGFace.h"
-#include "Message.h"
+#include "GmshMessage.h"
template<class T>
static void addExtrudeNormals(std::vector<T*> &elements, int invert)
diff --git a/Mesh/DivideAndConquer.cpp b/Mesh/DivideAndConquer.cpp
index bccb8bd837..dc38297cef 100644
--- a/Mesh/DivideAndConquer.cpp
+++ b/Mesh/DivideAndConquer.cpp
@@ -15,7 +15,7 @@
// Warning: point positions must be PERTURBED by a small random
// value to avoid 3 aligned points or 4 cocyclical points!
-#include "Message.h"
+#include "GmshMessage.h"
#include "Numeric.h"
#include "DivideAndConquer.h"
#include "MallocUtils.h"
diff --git a/Mesh/Field.cpp b/Mesh/Field.cpp
index 59e4c76bda..079ce719f6 100644
--- a/Mesh/Field.cpp
+++ b/Mesh/Field.cpp
@@ -25,7 +25,7 @@
#include "Field.h"
#include "GeoInterpolation.h"
#include "GModel.h"
-#include "Message.h"
+#include "GmshMessage.h"
#if !defined(HAVE_NO_POST)
#include "OctreePost.h"
diff --git a/Mesh/Generator.cpp b/Mesh/Generator.cpp
index 212280b162..a6185f3000 100644
--- a/Mesh/Generator.cpp
+++ b/Mesh/Generator.cpp
@@ -4,7 +4,7 @@
// bugs and problems to <gmsh@geuz.org>.
#include <stdlib.h>
-#include "Message.h"
+#include "GmshMessage.h"
#include "Numeric.h"
#include "Context.h"
#include "OS.h"
diff --git a/Mesh/HighOrder.cpp b/Mesh/HighOrder.cpp
index 891481a725..3bcccdf749 100644
--- a/Mesh/HighOrder.cpp
+++ b/Mesh/HighOrder.cpp
@@ -7,7 +7,7 @@
#include "gmshSmoothHighOrder.h"
#include "meshGFaceOptimize.h"
#include "MElement.h"
-#include "Message.h"
+#include "GmshMessage.h"
#include "OS.h"
#include "Numeric.h"
#include "Context.h"
diff --git a/Mesh/Makefile b/Mesh/Makefile
index c68a147819..77037ba524 100644
--- a/Mesh/Makefile
+++ b/Mesh/Makefile
@@ -75,7 +75,7 @@ depend:
rm -f Makefile.new
# DO NOT DELETE THIS LINE
-Generator.o: Generator.cpp ../Common/Message.h ../Numeric/Numeric.h \
+Generator.o: Generator.cpp ../Common/GmshMessage.h ../Numeric/Numeric.h \
../Numeric/NumericEmbedded.h ../Common/Context.h ../Geo/CGNSOptions.h \
../Mesh/PartitionOptions.h ../Common/OS.h ../Geo/GModel.h \
../Geo/GVertex.h ../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \
@@ -107,26 +107,27 @@ Field.o: Field.cpp ../Common/Context.h ../Geo/CGNSOptions.h \
../Geo/GEntity.h ../Geo/GPoint.h ../Geo/GEdgeLoop.h ../Geo/GEdge.h \
../Geo/SPoint2.h ../Geo/SVector3.h ../Geo/Pair.h ../Geo/GRegion.h \
../Geo/GEntity.h ../Geo/SPoint3.h ../Geo/SBoundingBox3d.h \
- ../Common/Message.h ../Post/OctreePost.h ../Common/Octree.h \
+ ../Common/GmshMessage.h ../Post/OctreePost.h ../Common/Octree.h \
../Common/OctreeInternals.h ../Post/PViewDataList.h ../Post/PViewData.h \
../Geo/MVertex.h ../Geo/SPoint3.h
gmshSmoothHighOrder.o: gmshSmoothHighOrder.cpp gmshSmoothHighOrder.h \
../Geo/SVector3.h ../Geo/SPoint3.h ../Numeric/gmshAssembler.h \
../Numeric/gmshLinearSystem.h ../Numeric/gmshLaplace.h \
../Numeric/gmshTermOfFormulation.h ../Common/GmshMatrix.h \
- ../Common/Gmsh.h ../Geo/GModel.h ../Geo/GVertex.h ../Geo/GEntity.h \
- ../Geo/Range.h ../Geo/SPoint3.h ../Geo/SBoundingBox3d.h \
- ../Geo/SPoint3.h ../Geo/GPoint.h ../Geo/SPoint2.h ../Geo/GEdge.h \
- ../Geo/GEntity.h ../Geo/GVertex.h ../Geo/SVector3.h ../Geo/SPoint3.h \
- ../Geo/SPoint2.h ../Geo/GFace.h ../Geo/GEntity.h ../Geo/GPoint.h \
- ../Geo/GEdgeLoop.h ../Geo/GEdge.h ../Geo/SPoint2.h ../Geo/SVector3.h \
- ../Geo/Pair.h ../Geo/GRegion.h ../Geo/GEntity.h ../Geo/SPoint3.h \
- ../Geo/SBoundingBox3d.h ../Geo/MElement.h ../Common/GmshDefines.h \
- ../Geo/MVertex.h ../Geo/SPoint3.h ../Geo/MEdge.h ../Geo/MVertex.h \
- ../Geo/SVector3.h ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h \
- ../Common/Message.h ../Numeric/FunctionSpace.h \
- ../Numeric/gmshElasticity.h ../Numeric/gmshTermOfFormulation.h \
- ../Numeric/gmshLinearSystemGmm.h ../Numeric/gmshLinearSystem.h
+ ../Common/Gmsh.h ../Common/GmshMessage.h ../Geo/GModel.h \
+ ../Geo/GVertex.h ../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \
+ ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Geo/GPoint.h \
+ ../Geo/SPoint2.h ../Geo/GEdge.h ../Geo/GEntity.h ../Geo/GVertex.h \
+ ../Geo/SVector3.h ../Geo/SPoint3.h ../Geo/SPoint2.h ../Geo/GFace.h \
+ ../Geo/GEntity.h ../Geo/GPoint.h ../Geo/GEdgeLoop.h ../Geo/GEdge.h \
+ ../Geo/SPoint2.h ../Geo/SVector3.h ../Geo/Pair.h ../Geo/GRegion.h \
+ ../Geo/GEntity.h ../Geo/SPoint3.h ../Geo/SBoundingBox3d.h \
+ ../Geo/MElement.h ../Common/GmshDefines.h ../Geo/MVertex.h \
+ ../Geo/SPoint3.h ../Geo/MEdge.h ../Geo/MVertex.h ../Geo/SVector3.h \
+ ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h \
+ ../Numeric/FunctionSpace.h ../Numeric/gmshElasticity.h \
+ ../Numeric/gmshTermOfFormulation.h ../Numeric/gmshLinearSystemGmm.h \
+ ../Numeric/gmshLinearSystem.h
meshGEdge.o: meshGEdge.cpp ../Geo/GModel.h ../Geo/GVertex.h \
../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \
../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Geo/GPoint.h \
@@ -138,7 +139,7 @@ meshGEdge.o: meshGEdge.cpp ../Geo/GModel.h ../Geo/GVertex.h \
../Geo/SBoundingBox3d.h meshGEdge.h ../Geo/MElement.h \
../Common/GmshDefines.h ../Geo/MVertex.h ../Geo/SPoint3.h \
../Geo/MEdge.h ../Geo/MVertex.h ../Geo/SVector3.h ../Geo/MFace.h \
- ../Geo/MVertex.h ../Geo/SVector3.h ../Common/Message.h \
+ ../Geo/MVertex.h ../Geo/SVector3.h ../Common/GmshMessage.h \
../Numeric/FunctionSpace.h ../Common/GmshMatrix.h BackgroundMesh.h \
../Numeric/Numeric.h ../Numeric/NumericEmbedded.h ../Common/Context.h \
../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h
@@ -153,13 +154,13 @@ meshGEdgeExtruded.o: meshGEdgeExtruded.cpp ../Geo/GModel.h \
../Geo/SBoundingBox3d.h ../Geo/MElement.h ../Common/GmshDefines.h \
../Geo/MVertex.h ../Geo/SPoint3.h ../Geo/MEdge.h ../Geo/MVertex.h \
../Geo/SVector3.h ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h \
- ../Common/Message.h ../Numeric/FunctionSpace.h ../Common/GmshMatrix.h \
- ../Geo/ExtrudeParams.h ../Common/SmoothData.h
+ ../Common/GmshMessage.h ../Numeric/FunctionSpace.h \
+ ../Common/GmshMatrix.h ../Geo/ExtrudeParams.h ../Common/SmoothData.h
meshGFace.o: meshGFace.cpp meshGFace.h meshGFaceBDS.h \
meshGFaceDelaunayInsertion.h ../Geo/MElement.h ../Common/GmshDefines.h \
../Geo/MVertex.h ../Geo/SPoint3.h ../Geo/MEdge.h ../Geo/MVertex.h \
../Geo/SVector3.h ../Geo/SPoint3.h ../Geo/MFace.h ../Geo/MVertex.h \
- ../Geo/SVector3.h ../Common/Message.h ../Numeric/FunctionSpace.h \
+ ../Geo/SVector3.h ../Common/GmshMessage.h ../Numeric/FunctionSpace.h \
../Common/GmshMatrix.h meshGFaceQuadrilateralize.h meshGFaceOptimize.h \
DivideAndConquer.h BackgroundMesh.h ../Geo/GVertex.h ../Geo/GEntity.h \
../Geo/Range.h ../Geo/SPoint3.h ../Geo/SBoundingBox3d.h \
@@ -183,7 +184,7 @@ meshGFaceTransfinite.o: meshGFaceTransfinite.cpp meshGFace.h \
../Geo/MVertex.h ../Geo/SPoint3.h ../Geo/MElement.h \
../Common/GmshDefines.h ../Geo/MVertex.h ../Geo/MEdge.h \
../Geo/MVertex.h ../Geo/SVector3.h ../Geo/MFace.h ../Geo/MVertex.h \
- ../Geo/SVector3.h ../Common/Message.h ../Numeric/FunctionSpace.h \
+ ../Geo/SVector3.h ../Common/GmshMessage.h ../Numeric/FunctionSpace.h \
../Common/GmshMatrix.h ../Common/Context.h ../Geo/CGNSOptions.h \
../Mesh/PartitionOptions.h ../Numeric/Numeric.h \
../Numeric/NumericEmbedded.h
@@ -198,16 +199,16 @@ meshGFaceExtruded.o: meshGFaceExtruded.cpp ../Geo/GModel.h \
../Geo/SBoundingBox3d.h ../Geo/MElement.h ../Common/GmshDefines.h \
../Geo/MVertex.h ../Geo/SPoint3.h ../Geo/MEdge.h ../Geo/MVertex.h \
../Geo/SVector3.h ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h \
- ../Common/Message.h ../Numeric/FunctionSpace.h ../Common/GmshMatrix.h \
- ../Geo/ExtrudeParams.h ../Common/SmoothData.h ../Common/Context.h \
- ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h
+ ../Common/GmshMessage.h ../Numeric/FunctionSpace.h \
+ ../Common/GmshMatrix.h ../Geo/ExtrudeParams.h ../Common/SmoothData.h \
+ ../Common/Context.h ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h
meshGFaceBDS.o: meshGFaceBDS.cpp meshGFace.h meshGFaceOptimize.h \
../Geo/MElement.h ../Common/GmshDefines.h ../Geo/MVertex.h \
../Geo/SPoint3.h ../Geo/MEdge.h ../Geo/MVertex.h ../Geo/SVector3.h \
../Geo/SPoint3.h ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h \
- ../Common/Message.h ../Numeric/FunctionSpace.h ../Common/GmshMatrix.h \
- meshGFaceDelaunayInsertion.h BackgroundMesh.h ../Geo/GVertex.h \
- ../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \
+ ../Common/GmshMessage.h ../Numeric/FunctionSpace.h \
+ ../Common/GmshMatrix.h meshGFaceDelaunayInsertion.h BackgroundMesh.h \
+ ../Geo/GVertex.h ../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \
../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Geo/GPoint.h \
../Geo/SPoint2.h ../Geo/GEdge.h ../Geo/GEntity.h ../Geo/GVertex.h \
../Geo/SVector3.h ../Geo/SPoint3.h ../Geo/SPoint2.h ../Geo/GFace.h \
@@ -224,7 +225,7 @@ meshGFaceDelaunayInsertion.o: meshGFaceDelaunayInsertion.cpp BDS.h \
../Geo/GEdgeLoop.h ../Geo/GEdge.h ../Geo/GEntity.h ../Geo/GVertex.h \
../Geo/GEntity.h ../Geo/GPoint.h ../Geo/SPoint2.h ../Geo/SVector3.h \
../Geo/SPoint3.h ../Geo/SPoint3.h ../Geo/SPoint2.h ../Geo/SPoint2.h \
- ../Geo/SVector3.h ../Geo/Pair.h ../Post/PView.h ../Common/Message.h \
+ ../Geo/SVector3.h ../Geo/Pair.h ../Post/PView.h ../Common/GmshMessage.h \
BackgroundMesh.h meshGFaceDelaunayInsertion.h ../Geo/MElement.h \
../Common/GmshDefines.h ../Geo/MVertex.h ../Geo/SPoint3.h \
../Geo/MEdge.h ../Geo/MVertex.h ../Geo/SVector3.h ../Geo/MFace.h \
@@ -236,33 +237,35 @@ meshGFaceOptimize.o: meshGFaceOptimize.cpp meshGFaceOptimize.h \
../Geo/MElement.h ../Common/GmshDefines.h ../Geo/MVertex.h \
../Geo/SPoint3.h ../Geo/MEdge.h ../Geo/MVertex.h ../Geo/SVector3.h \
../Geo/SPoint3.h ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h \
- ../Common/Message.h ../Numeric/FunctionSpace.h ../Common/GmshMatrix.h \
- meshGFaceDelaunayInsertion.h qualityMeasures.h ../Geo/GFace.h \
- ../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \
+ ../Common/GmshMessage.h ../Numeric/FunctionSpace.h \
+ ../Common/GmshMatrix.h meshGFaceDelaunayInsertion.h qualityMeasures.h \
+ ../Geo/GFace.h ../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \
../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Geo/GPoint.h \
../Geo/GEdgeLoop.h ../Geo/GEdge.h ../Geo/GEntity.h ../Geo/GVertex.h \
../Geo/GEntity.h ../Geo/GPoint.h ../Geo/SPoint2.h ../Geo/SVector3.h \
../Geo/SPoint3.h ../Geo/SPoint2.h ../Geo/SPoint2.h ../Geo/SVector3.h \
../Geo/Pair.h BackgroundMesh.h
meshGFaceQuadrilateralize.o: meshGFaceQuadrilateralize.cpp \
- meshGFaceQuadrilateralize.h ../Common/Message.h ../Numeric/Numeric.h \
- ../Numeric/NumericEmbedded.h meshGFaceDelaunayInsertion.h \
- ../Geo/MElement.h ../Common/GmshDefines.h ../Geo/MVertex.h \
- ../Geo/SPoint3.h ../Geo/MEdge.h ../Geo/MVertex.h ../Geo/SVector3.h \
- ../Geo/SPoint3.h ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h \
- ../Numeric/FunctionSpace.h ../Common/GmshMatrix.h meshGFaceOptimize.h \
- meshGFaceBDS.h BDS.h ../Geo/GFace.h ../Geo/GEntity.h ../Geo/Range.h \
- ../Geo/SPoint3.h ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h \
- ../Geo/GPoint.h ../Geo/GEdgeLoop.h ../Geo/GEdge.h ../Geo/GEntity.h \
- ../Geo/GVertex.h ../Geo/GEntity.h ../Geo/GPoint.h ../Geo/SPoint2.h \
- ../Geo/SVector3.h ../Geo/SPoint3.h ../Geo/SPoint2.h ../Geo/SPoint2.h \
- ../Geo/SVector3.h ../Geo/Pair.h ../Post/PView.h
+ meshGFaceQuadrilateralize.h ../Common/GmshMessage.h \
+ ../Numeric/Numeric.h ../Numeric/NumericEmbedded.h \
+ meshGFaceDelaunayInsertion.h ../Geo/MElement.h ../Common/GmshDefines.h \
+ ../Geo/MVertex.h ../Geo/SPoint3.h ../Geo/MEdge.h ../Geo/MVertex.h \
+ ../Geo/SVector3.h ../Geo/SPoint3.h ../Geo/MFace.h ../Geo/MVertex.h \
+ ../Geo/SVector3.h ../Numeric/FunctionSpace.h ../Common/GmshMatrix.h \
+ meshGFaceOptimize.h meshGFaceBDS.h BDS.h ../Geo/GFace.h \
+ ../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \
+ ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Geo/GPoint.h \
+ ../Geo/GEdgeLoop.h ../Geo/GEdge.h ../Geo/GEntity.h ../Geo/GVertex.h \
+ ../Geo/GEntity.h ../Geo/GPoint.h ../Geo/SPoint2.h ../Geo/SVector3.h \
+ ../Geo/SPoint3.h ../Geo/SPoint2.h ../Geo/SPoint2.h ../Geo/SVector3.h \
+ ../Geo/Pair.h ../Post/PView.h
meshGRegion.o: meshGRegion.cpp meshGRegion.h \
meshGRegionDelaunayInsertion.h ../Geo/MElement.h \
../Common/GmshDefines.h ../Geo/MVertex.h ../Geo/SPoint3.h \
../Geo/MEdge.h ../Geo/MVertex.h ../Geo/SVector3.h ../Geo/SPoint3.h \
- ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h ../Common/Message.h \
- ../Numeric/FunctionSpace.h ../Common/GmshMatrix.h ../Numeric/Numeric.h \
+ ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h \
+ ../Common/GmshMessage.h ../Numeric/FunctionSpace.h \
+ ../Common/GmshMatrix.h ../Numeric/Numeric.h \
../Numeric/NumericEmbedded.h BackgroundMesh.h qualityMeasures.h \
../Geo/GModel.h ../Geo/GVertex.h ../Geo/GEntity.h ../Geo/Range.h \
../Geo/SPoint3.h ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h \
@@ -283,8 +286,9 @@ meshGRegionDelaunayInsertion.o: meshGRegionDelaunayInsertion.cpp \
meshGRegionDelaunayInsertion.h ../Geo/MElement.h \
../Common/GmshDefines.h ../Geo/MVertex.h ../Geo/SPoint3.h \
../Geo/MEdge.h ../Geo/MVertex.h ../Geo/SVector3.h ../Geo/SPoint3.h \
- ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h ../Common/Message.h \
- ../Numeric/FunctionSpace.h ../Common/GmshMatrix.h ../Numeric/Numeric.h \
+ ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h \
+ ../Common/GmshMessage.h ../Numeric/FunctionSpace.h \
+ ../Common/GmshMatrix.h ../Numeric/Numeric.h \
../Numeric/NumericEmbedded.h qualityMeasures.h ../Geo/GModel.h \
../Geo/GVertex.h ../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \
../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Geo/GPoint.h \
@@ -303,7 +307,7 @@ meshGRegionTransfinite.o: meshGRegionTransfinite.cpp meshGFace.h \
../Geo/MVertex.h ../Geo/SPoint3.h ../Geo/MElement.h \
../Common/GmshDefines.h ../Geo/MVertex.h ../Geo/MEdge.h \
../Geo/MVertex.h ../Geo/SVector3.h ../Geo/MFace.h ../Geo/MVertex.h \
- ../Geo/SVector3.h ../Common/Message.h ../Numeric/FunctionSpace.h \
+ ../Geo/SVector3.h ../Common/GmshMessage.h ../Numeric/FunctionSpace.h \
../Common/GmshMatrix.h ../Common/Context.h ../Geo/CGNSOptions.h \
../Mesh/PartitionOptions.h
meshGRegionExtruded.o: meshGRegionExtruded.cpp ../Geo/GModel.h \
@@ -317,9 +321,10 @@ meshGRegionExtruded.o: meshGRegionExtruded.cpp ../Geo/GModel.h \
../Geo/SBoundingBox3d.h ../Geo/MElement.h ../Common/GmshDefines.h \
../Geo/MVertex.h ../Geo/SPoint3.h ../Geo/MEdge.h ../Geo/MVertex.h \
../Geo/SVector3.h ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h \
- ../Common/Message.h ../Numeric/FunctionSpace.h ../Common/GmshMatrix.h \
- ../Geo/ExtrudeParams.h ../Common/SmoothData.h meshGFace.h meshGRegion.h \
- ../Common/Context.h ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h
+ ../Common/GmshMessage.h ../Numeric/FunctionSpace.h \
+ ../Common/GmshMatrix.h ../Geo/ExtrudeParams.h ../Common/SmoothData.h \
+ meshGFace.h meshGRegion.h ../Common/Context.h ../Geo/CGNSOptions.h \
+ ../Mesh/PartitionOptions.h
meshGRegionCarveHole.o: meshGRegionCarveHole.cpp ../Geo/GModel.h \
../Geo/GVertex.h ../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \
../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Geo/GPoint.h \
@@ -331,24 +336,26 @@ meshGRegionCarveHole.o: meshGRegionCarveHole.cpp ../Geo/GModel.h \
../Geo/SBoundingBox3d.h ../Geo/MElement.h ../Common/GmshDefines.h \
../Geo/MVertex.h ../Geo/SPoint3.h ../Geo/MEdge.h ../Geo/MVertex.h \
../Geo/SVector3.h ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h \
- ../Common/Message.h ../Numeric/FunctionSpace.h ../Common/GmshMatrix.h
+ ../Common/GmshMessage.h ../Numeric/FunctionSpace.h \
+ ../Common/GmshMatrix.h
meshGRegionLocalMeshMod.o: meshGRegionLocalMeshMod.cpp \
meshGRegionLocalMeshMod.h meshGRegionDelaunayInsertion.h \
../Geo/MElement.h ../Common/GmshDefines.h ../Geo/MVertex.h \
../Geo/SPoint3.h ../Geo/MEdge.h ../Geo/MVertex.h ../Geo/SVector3.h \
../Geo/SPoint3.h ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h \
- ../Common/Message.h ../Numeric/FunctionSpace.h ../Common/GmshMatrix.h \
- ../Numeric/Numeric.h ../Numeric/NumericEmbedded.h BackgroundMesh.h \
- qualityMeasures.h ../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \
+ ../Common/GmshMessage.h ../Numeric/FunctionSpace.h \
+ ../Common/GmshMatrix.h ../Numeric/Numeric.h \
+ ../Numeric/NumericEmbedded.h BackgroundMesh.h qualityMeasures.h \
+ ../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \
../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Geo/GRegion.h \
../Geo/GEntity.h
-DivideAndConquer.o: DivideAndConquer.cpp ../Common/Message.h \
+DivideAndConquer.o: DivideAndConquer.cpp ../Common/GmshMessage.h \
../Numeric/Numeric.h ../Numeric/NumericEmbedded.h DivideAndConquer.h \
../Common/MallocUtils.h
-BackgroundMesh.o: BackgroundMesh.cpp ../Common/Message.h BackgroundMesh.h \
- ../Numeric/Numeric.h ../Numeric/NumericEmbedded.h ../Common/Context.h \
- ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h ../Geo/GVertex.h \
- ../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \
+BackgroundMesh.o: BackgroundMesh.cpp ../Common/GmshMessage.h \
+ BackgroundMesh.h ../Numeric/Numeric.h ../Numeric/NumericEmbedded.h \
+ ../Common/Context.h ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h \
+ ../Geo/GVertex.h ../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \
../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Geo/GPoint.h \
../Geo/SPoint2.h ../Geo/GEdge.h ../Geo/GEntity.h ../Geo/GVertex.h \
../Geo/SVector3.h ../Geo/SPoint3.h ../Geo/SPoint3.h ../Geo/SPoint2.h \
@@ -363,7 +370,7 @@ qualityMeasures.o: qualityMeasures.cpp qualityMeasures.h BDS.h \
../Geo/GEdgeLoop.h ../Geo/GEdge.h ../Geo/GEntity.h ../Geo/GVertex.h \
../Geo/GEntity.h ../Geo/GPoint.h ../Geo/SPoint2.h ../Geo/SVector3.h \
../Geo/SPoint3.h ../Geo/SPoint3.h ../Geo/SPoint2.h ../Geo/SPoint2.h \
- ../Geo/SVector3.h ../Geo/Pair.h ../Post/PView.h ../Common/Message.h \
+ ../Geo/SVector3.h ../Geo/Pair.h ../Post/PView.h ../Common/GmshMessage.h \
../Geo/MVertex.h ../Geo/SPoint3.h ../Geo/MElement.h \
../Common/GmshDefines.h ../Geo/MVertex.h ../Geo/MEdge.h \
../Geo/MVertex.h ../Geo/SVector3.h ../Geo/MFace.h ../Geo/MVertex.h \
@@ -380,16 +387,16 @@ BoundaryLayers.o: BoundaryLayers.cpp ../Geo/GModel.h ../Geo/GVertex.h \
../Geo/SBoundingBox3d.h ../Geo/MElement.h ../Common/GmshDefines.h \
../Geo/MVertex.h ../Geo/SPoint3.h ../Geo/MEdge.h ../Geo/MVertex.h \
../Geo/SVector3.h ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h \
- ../Common/Message.h ../Numeric/FunctionSpace.h ../Common/GmshMatrix.h \
- BoundaryLayers.h ../Geo/ExtrudeParams.h ../Common/SmoothData.h \
- meshGEdge.h meshGFace.h
+ ../Common/GmshMessage.h ../Numeric/FunctionSpace.h \
+ ../Common/GmshMatrix.h BoundaryLayers.h ../Geo/ExtrudeParams.h \
+ ../Common/SmoothData.h meshGEdge.h meshGFace.h
BDS.o: BDS.cpp ../Numeric/Numeric.h ../Numeric/NumericEmbedded.h BDS.h \
../Geo/GFace.h ../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \
../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Geo/GPoint.h \
../Geo/GEdgeLoop.h ../Geo/GEdge.h ../Geo/GEntity.h ../Geo/GVertex.h \
../Geo/GEntity.h ../Geo/GPoint.h ../Geo/SPoint2.h ../Geo/SVector3.h \
../Geo/SPoint3.h ../Geo/SPoint3.h ../Geo/SPoint2.h ../Geo/SPoint2.h \
- ../Geo/SVector3.h ../Geo/Pair.h ../Post/PView.h ../Common/Message.h \
+ ../Geo/SVector3.h ../Geo/Pair.h ../Post/PView.h ../Common/GmshMessage.h \
meshGFaceDelaunayInsertion.h ../Geo/MElement.h ../Common/GmshDefines.h \
../Geo/MVertex.h ../Geo/SPoint3.h ../Geo/MEdge.h ../Geo/MVertex.h \
../Geo/SVector3.h ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h \
@@ -405,16 +412,17 @@ HighOrder.o: HighOrder.cpp HighOrder.h ../Geo/GModel.h ../Geo/GVertex.h \
../Geo/SBoundingBox3d.h gmshSmoothHighOrder.h meshGFaceOptimize.h \
../Geo/MElement.h ../Common/GmshDefines.h ../Geo/MVertex.h \
../Geo/SPoint3.h ../Geo/MEdge.h ../Geo/MVertex.h ../Geo/SVector3.h \
- ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h ../Common/Message.h \
- ../Numeric/FunctionSpace.h ../Common/GmshMatrix.h \
- meshGFaceDelaunayInsertion.h ../Common/OS.h ../Numeric/Numeric.h \
- ../Numeric/NumericEmbedded.h ../Common/Context.h ../Geo/CGNSOptions.h \
- ../Mesh/PartitionOptions.h ../Geo/GFaceCompound.h ../Geo/Geo.h \
- ../Geo/gmshSurface.h ../Geo/Pair.h ../Geo/Range.h ../Geo/SPoint2.h \
- ../Geo/SPoint3.h ../Geo/SVector3.h ../Geo/SBoundingBox3d.h \
- ../Common/ListUtils.h ../Common/TreeUtils.h ../Common/avl.h \
- ../Common/ListUtils.h ../Geo/SPoint2.h ../Geo/ExtrudeParams.h \
- ../Common/SmoothData.h ../Geo/GFace.h ../Geo/GFace.h ../Geo/GEdge.h
+ ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h \
+ ../Common/GmshMessage.h ../Numeric/FunctionSpace.h \
+ ../Common/GmshMatrix.h meshGFaceDelaunayInsertion.h ../Common/OS.h \
+ ../Numeric/Numeric.h ../Numeric/NumericEmbedded.h ../Common/Context.h \
+ ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h ../Geo/GFaceCompound.h \
+ ../Geo/Geo.h ../Geo/gmshSurface.h ../Geo/Pair.h ../Geo/Range.h \
+ ../Geo/SPoint2.h ../Geo/SPoint3.h ../Geo/SVector3.h \
+ ../Geo/SBoundingBox3d.h ../Common/ListUtils.h ../Common/TreeUtils.h \
+ ../Common/avl.h ../Common/ListUtils.h ../Geo/SPoint2.h \
+ ../Geo/ExtrudeParams.h ../Common/SmoothData.h ../Geo/GFace.h \
+ ../Geo/GFace.h ../Geo/GEdge.h
Partition.o: Partition.cpp ../Geo/GModel.h ../Geo/GVertex.h \
../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \
../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Geo/GPoint.h \
@@ -426,5 +434,6 @@ Partition.o: Partition.cpp ../Geo/GModel.h ../Geo/GVertex.h \
../Geo/SBoundingBox3d.h Partition.h PartitionObjects.h \
../Geo/MElement.h ../Common/GmshDefines.h ../Geo/MVertex.h \
../Geo/SPoint3.h ../Geo/MEdge.h ../Geo/MVertex.h ../Geo/SVector3.h \
- ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h ../Common/Message.h \
- ../Numeric/FunctionSpace.h ../Common/GmshMatrix.h PartitionOptions.h
+ ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h \
+ ../Common/GmshMessage.h ../Numeric/FunctionSpace.h \
+ ../Common/GmshMatrix.h PartitionOptions.h
diff --git a/Mesh/PartitionObjects.h b/Mesh/PartitionObjects.h
index d461ec91dd..1f7f378aeb 100644
--- a/Mesh/PartitionObjects.h
+++ b/Mesh/PartitionObjects.h
@@ -8,7 +8,7 @@
#include <map>
#include <vector>
#include "MElement.h"
-#include "Message.h"
+#include "GmshMessage.h"
/*******************************************************************************
diff --git a/Mesh/meshGEdge.cpp b/Mesh/meshGEdge.cpp
index 1bed85769b..ddfec538be 100644
--- a/Mesh/meshGEdge.cpp
+++ b/Mesh/meshGEdge.cpp
@@ -9,7 +9,7 @@
#include "MElement.h"
#include "BackgroundMesh.h"
#include "Numeric.h"
-#include "Message.h"
+#include "GmshMessage.h"
#include "Context.h"
#define SQU(a) ((a)*(a))
diff --git a/Mesh/meshGEdgeExtruded.cpp b/Mesh/meshGEdgeExtruded.cpp
index c880218eb6..0b1e55f5e1 100644
--- a/Mesh/meshGEdgeExtruded.cpp
+++ b/Mesh/meshGEdgeExtruded.cpp
@@ -7,7 +7,7 @@
#include "GModel.h"
#include "MElement.h"
#include "ExtrudeParams.h"
-#include "Message.h"
+#include "GmshMessage.h"
static void extrudeMesh(GVertex *from, GEdge *to)
{
diff --git a/Mesh/meshGFace.cpp b/Mesh/meshGFace.cpp
index 727c34af49..e31a90b134 100644
--- a/Mesh/meshGFace.cpp
+++ b/Mesh/meshGFace.cpp
@@ -19,7 +19,7 @@
#include "MElement.h"
#include "Context.h"
#include "GPoint.h"
-#include "Message.h"
+#include "GmshMessage.h"
#include "Numeric.h"
#include "BDS.h"
#include "qualityMeasures.h"
diff --git a/Mesh/meshGFaceBDS.cpp b/Mesh/meshGFaceBDS.cpp
index 41011f1536..91ca345589 100644
--- a/Mesh/meshGFaceBDS.cpp
+++ b/Mesh/meshGFaceBDS.cpp
@@ -15,7 +15,7 @@
#include "Context.h"
#include "GPoint.h"
#include "GModel.h"
-#include "Message.h"
+#include "GmshMessage.h"
#include "Numeric.h"
#include "BDS.h"
#include "qualityMeasures.h"
diff --git a/Mesh/meshGFaceDelaunayInsertion.cpp b/Mesh/meshGFaceDelaunayInsertion.cpp
index 80df601f76..afa2da7ed0 100644
--- a/Mesh/meshGFaceDelaunayInsertion.cpp
+++ b/Mesh/meshGFaceDelaunayInsertion.cpp
@@ -10,7 +10,7 @@
#include "meshGFace.h"
#include "GFace.h"
#include "Numeric.h"
-#include "Message.h"
+#include "GmshMessage.h"
#include <set>
#include <map>
#include <algorithm>
diff --git a/Mesh/meshGFaceExtruded.cpp b/Mesh/meshGFaceExtruded.cpp
index eefe79d390..ae322e8002 100644
--- a/Mesh/meshGFaceExtruded.cpp
+++ b/Mesh/meshGFaceExtruded.cpp
@@ -8,7 +8,7 @@
#include "MElement.h"
#include "ExtrudeParams.h"
#include "Context.h"
-#include "Message.h"
+#include "GmshMessage.h"
extern Context_T CTX;
diff --git a/Mesh/meshGFaceOptimize.cpp b/Mesh/meshGFaceOptimize.cpp
index f899bc5302..72fdb6c50b 100644
--- a/Mesh/meshGFaceOptimize.cpp
+++ b/Mesh/meshGFaceOptimize.cpp
@@ -11,7 +11,7 @@
#include "MVertex.h"
#include "MElement.h"
#include "BackgroundMesh.h"
-#include "Message.h"
+#include "GmshMessage.h"
static void setLcsInit(MTriangle *t, std::map<MVertex*, double> &vSizes)
{
diff --git a/Mesh/meshGFaceQuadrilateralize.cpp b/Mesh/meshGFaceQuadrilateralize.cpp
index 28dc9b1152..16ae863c46 100644
--- a/Mesh/meshGFaceQuadrilateralize.cpp
+++ b/Mesh/meshGFaceQuadrilateralize.cpp
@@ -4,7 +4,7 @@
// bugs and problems to <gmsh@geuz.org>.
#include "meshGFaceQuadrilateralize.h"
-#include "Message.h"
+#include "GmshMessage.h"
#include "Numeric.h"
#include "meshGFaceDelaunayInsertion.h"
#include "meshGFaceOptimize.h"
diff --git a/Mesh/meshGFaceTransfinite.cpp b/Mesh/meshGFaceTransfinite.cpp
index 08aa4fa2c1..1bb68b296d 100644
--- a/Mesh/meshGFaceTransfinite.cpp
+++ b/Mesh/meshGFaceTransfinite.cpp
@@ -11,7 +11,7 @@
#include "MVertex.h"
#include "MElement.h"
#include "Context.h"
-#include "Message.h"
+#include "GmshMessage.h"
#include "Numeric.h"
#define SQU(a) ((a)*(a))
diff --git a/Mesh/meshGRegion.cpp b/Mesh/meshGRegion.cpp
index 1a2bd0669a..47ba750408 100644
--- a/Mesh/meshGRegion.cpp
+++ b/Mesh/meshGRegion.cpp
@@ -13,7 +13,7 @@
#include "GEdge.h"
#include "gmshRegion.h"
#include "BDS.h"
-#include "Message.h"
+#include "GmshMessage.h"
#include "Context.h"
extern Context_T CTX;
diff --git a/Mesh/meshGRegionCarveHole.cpp b/Mesh/meshGRegionCarveHole.cpp
index b0c73f668a..473284576d 100644
--- a/Mesh/meshGRegionCarveHole.cpp
+++ b/Mesh/meshGRegionCarveHole.cpp
@@ -6,7 +6,7 @@
#include <set>
#include "GModel.h"
#include "MElement.h"
-#include "Message.h"
+#include "GmshMessage.h"
#if !defined(HAVE_ANN)
diff --git a/Mesh/meshGRegionDelaunayInsertion.cpp b/Mesh/meshGRegionDelaunayInsertion.cpp
index 083aa72761..9d3b928262 100644
--- a/Mesh/meshGRegionDelaunayInsertion.cpp
+++ b/Mesh/meshGRegionDelaunayInsertion.cpp
@@ -11,7 +11,7 @@
#include "GModel.h"
#include "GRegion.h"
#include "Numeric.h"
-#include "Message.h"
+#include "GmshMessage.h"
#include <set>
#include <map>
#include <algorithm>
diff --git a/Mesh/meshGRegionExtruded.cpp b/Mesh/meshGRegionExtruded.cpp
index 34de3a3cca..370714f960 100644
--- a/Mesh/meshGRegionExtruded.cpp
+++ b/Mesh/meshGRegionExtruded.cpp
@@ -10,7 +10,7 @@
#include "meshGFace.h"
#include "meshGRegion.h"
#include "Context.h"
-#include "Message.h"
+#include "GmshMessage.h"
extern Context_T CTX;
diff --git a/Mesh/meshGRegionLocalMeshMod.cpp b/Mesh/meshGRegionLocalMeshMod.cpp
index fa51c85f8e..2dddd409d2 100644
--- a/Mesh/meshGRegionLocalMeshMod.cpp
+++ b/Mesh/meshGRegionLocalMeshMod.cpp
@@ -6,7 +6,7 @@
#include "meshGRegionLocalMeshMod.h"
#include "GEntity.h"
#include "GRegion.h"
-#include "Message.h"
+#include "GmshMessage.h"
#include "Numeric.h"
static int edges[6][2] = {{0,1},{0,2},{0,3},{1,2},{1,3},{2,3}};
diff --git a/Mesh/meshGRegionTransfinite.cpp b/Mesh/meshGRegionTransfinite.cpp
index c14447c00f..8339d12557 100644
--- a/Mesh/meshGRegionTransfinite.cpp
+++ b/Mesh/meshGRegionTransfinite.cpp
@@ -10,7 +10,7 @@
#include "MVertex.h"
#include "MElement.h"
#include "Context.h"
-#include "Message.h"
+#include "GmshMessage.h"
/*
Transfinite volume meshes
diff --git a/Mesh/qualityMeasures.cpp b/Mesh/qualityMeasures.cpp
index e5c4b18278..3317585aee 100644
--- a/Mesh/qualityMeasures.cpp
+++ b/Mesh/qualityMeasures.cpp
@@ -9,7 +9,7 @@
#include "MElement.h"
#include "Numeric.h"
#include "FunctionSpace.h"
-#include "Message.h"
+#include "GmshMessage.h"
double qmTriangle(const BDS_Point *p1, const BDS_Point *p2, const BDS_Point *p3,
const gmshQualityMeasure4Triangle &cr)
diff --git a/Numeric/FunctionSpace.cpp b/Numeric/FunctionSpace.cpp
index 4196929813..5ca9ce67a2 100644
--- a/Numeric/FunctionSpace.cpp
+++ b/Numeric/FunctionSpace.cpp
@@ -5,7 +5,7 @@
#include "FunctionSpace.h"
#include "GmshDefines.h"
-#include "Message.h"
+#include "GmshMessage.h"
Double_Matrix generate1DMonomials(int order)
diff --git a/Numeric/Makefile b/Numeric/Makefile
index 3f112ced60..6f11d25daf 100644
--- a/Numeric/Makefile
+++ b/Numeric/Makefile
@@ -50,27 +50,15 @@ depend:
rm -f Makefile.new
# DO NOT DELETE THIS LINE
-Numeric.o: Numeric.cpp ../Common/Message.h Numeric.h NumericEmbedded.h
+Numeric.o: Numeric.cpp ../Common/GmshMessage.h Numeric.h \
+ NumericEmbedded.h
NumericEmbedded.o: NumericEmbedded.cpp NumericEmbedded.h \
- ../Common/Message.h
+ ../Common/GmshMessage.h
gmshAssembler.o: gmshAssembler.cpp ../Geo/MVertex.h ../Geo/SPoint3.h \
gmshAssembler.h gmshLinearSystem.h
gmshTermOfFormulation.o: gmshTermOfFormulation.cpp \
gmshTermOfFormulation.h ../Common/GmshMatrix.h gmshFunction.h \
- ../Common/Gmsh.h ../Geo/GModel.h ../Geo/GVertex.h ../Geo/GEntity.h \
- ../Geo/Range.h ../Geo/SPoint3.h ../Geo/SBoundingBox3d.h \
- ../Geo/SPoint3.h ../Geo/GPoint.h ../Geo/SPoint2.h ../Geo/GEdge.h \
- ../Geo/GEntity.h ../Geo/GVertex.h ../Geo/SVector3.h ../Geo/SPoint3.h \
- ../Geo/SPoint3.h ../Geo/SPoint2.h ../Geo/GFace.h ../Geo/GEntity.h \
- ../Geo/GPoint.h ../Geo/GEdgeLoop.h ../Geo/GEdge.h ../Geo/SPoint2.h \
- ../Geo/SVector3.h ../Geo/Pair.h ../Geo/GRegion.h ../Geo/GEntity.h \
- ../Geo/SPoint3.h ../Geo/SBoundingBox3d.h ../Geo/MElement.h \
- ../Common/GmshDefines.h ../Geo/MVertex.h ../Geo/SPoint3.h \
- ../Geo/MEdge.h ../Geo/MVertex.h ../Geo/SVector3.h ../Geo/MFace.h \
- ../Geo/MVertex.h ../Geo/SVector3.h ../Common/Message.h \
- ../Numeric/FunctionSpace.h gmshLinearSystem.h gmshAssembler.h
-gmshLaplace.o: gmshLaplace.cpp gmshLaplace.h gmshTermOfFormulation.h \
- ../Common/GmshMatrix.h ../Common/Gmsh.h ../Geo/GModel.h \
+ ../Common/Gmsh.h ../Common/GmshMessage.h ../Geo/GModel.h \
../Geo/GVertex.h ../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \
../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Geo/GPoint.h \
../Geo/SPoint2.h ../Geo/GEdge.h ../Geo/GEntity.h ../Geo/GVertex.h \
@@ -81,9 +69,9 @@ gmshLaplace.o: gmshLaplace.cpp gmshLaplace.h gmshTermOfFormulation.h \
../Geo/SBoundingBox3d.h ../Geo/MElement.h ../Common/GmshDefines.h \
../Geo/MVertex.h ../Geo/SPoint3.h ../Geo/MEdge.h ../Geo/MVertex.h \
../Geo/SVector3.h ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h \
- ../Common/Message.h ../Numeric/FunctionSpace.h
-gmshElasticity.o: gmshElasticity.cpp gmshElasticity.h \
- gmshTermOfFormulation.h ../Common/GmshMatrix.h ../Common/Gmsh.h \
+ ../Numeric/FunctionSpace.h gmshLinearSystem.h gmshAssembler.h
+gmshLaplace.o: gmshLaplace.cpp gmshLaplace.h gmshTermOfFormulation.h \
+ ../Common/GmshMatrix.h ../Common/Gmsh.h ../Common/GmshMessage.h \
../Geo/GModel.h ../Geo/GVertex.h ../Geo/GEntity.h ../Geo/Range.h \
../Geo/SPoint3.h ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h \
../Geo/GPoint.h ../Geo/SPoint2.h ../Geo/GEdge.h ../Geo/GEntity.h \
@@ -94,12 +82,28 @@ gmshElasticity.o: gmshElasticity.cpp gmshElasticity.h \
../Geo/SBoundingBox3d.h ../Geo/MElement.h ../Common/GmshDefines.h \
../Geo/MVertex.h ../Geo/SPoint3.h ../Geo/MEdge.h ../Geo/MVertex.h \
../Geo/SVector3.h ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h \
- ../Common/Message.h ../Numeric/FunctionSpace.h
+ ../Numeric/FunctionSpace.h
+gmshElasticity.o: gmshElasticity.cpp gmshElasticity.h \
+ gmshTermOfFormulation.h ../Common/GmshMatrix.h ../Common/Gmsh.h \
+ ../Common/GmshMessage.h ../Geo/GModel.h ../Geo/GVertex.h \
+ ../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \
+ ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Geo/GPoint.h \
+ ../Geo/SPoint2.h ../Geo/GEdge.h ../Geo/GEntity.h ../Geo/GVertex.h \
+ ../Geo/SVector3.h ../Geo/SPoint3.h ../Geo/SPoint3.h ../Geo/SPoint2.h \
+ ../Geo/GFace.h ../Geo/GEntity.h ../Geo/GPoint.h ../Geo/GEdgeLoop.h \
+ ../Geo/GEdge.h ../Geo/SPoint2.h ../Geo/SVector3.h ../Geo/Pair.h \
+ ../Geo/GRegion.h ../Geo/GEntity.h ../Geo/SPoint3.h \
+ ../Geo/SBoundingBox3d.h ../Geo/MElement.h ../Common/GmshDefines.h \
+ ../Geo/MVertex.h ../Geo/SPoint3.h ../Geo/MEdge.h ../Geo/MVertex.h \
+ ../Geo/SVector3.h ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h \
+ ../Numeric/FunctionSpace.h
EigSolve.o: EigSolve.cpp
FunctionSpace.o: FunctionSpace.cpp FunctionSpace.h ../Common/GmshMatrix.h \
- ../Common/GmshDefines.h ../Common/Message.h
+ ../Common/GmshDefines.h ../Common/GmshMessage.h
gmsh_predicates.o: gmsh_predicates.cpp
-gsl_newt.o: gsl_newt.cpp ../Common/Message.h Numeric.h NumericEmbedded.h
-gsl_min.o: gsl_min.cpp ../Common/Message.h Numeric.h NumericEmbedded.h
-gsl_brent.o: gsl_brent.cpp ../Common/Message.h Numeric.h \
+gsl_newt.o: gsl_newt.cpp ../Common/GmshMessage.h Numeric.h \
+ NumericEmbedded.h
+gsl_min.o: gsl_min.cpp ../Common/GmshMessage.h Numeric.h \
+ NumericEmbedded.h
+gsl_brent.o: gsl_brent.cpp ../Common/GmshMessage.h Numeric.h \
NumericEmbedded.h
diff --git a/Numeric/Numeric.cpp b/Numeric/Numeric.cpp
index cb5af2bfb3..4c7d0233a2 100644
--- a/Numeric/Numeric.cpp
+++ b/Numeric/Numeric.cpp
@@ -3,7 +3,7 @@
// See the LICENSE.txt file for license information. Please report all
// bugs and problems to <gmsh@geuz.org>.
-#include "Message.h"
+#include "GmshMessage.h"
#include "Numeric.h"
// Check GSL version. We need at least 1.2, since all versions <=
diff --git a/Numeric/NumericEmbedded.cpp b/Numeric/NumericEmbedded.cpp
index 6daede6b39..c1963fefd1 100644
--- a/Numeric/NumericEmbedded.cpp
+++ b/Numeric/NumericEmbedded.cpp
@@ -8,7 +8,7 @@
// Msg)
#include "NumericEmbedded.h"
-#include "Message.h"
+#include "GmshMessage.h"
#define SQU(a) ((a)*(a))
diff --git a/Numeric/gmshLinearSystemGmm.h b/Numeric/gmshLinearSystemGmm.h
index f94d7b4b91..13eff4cd1f 100644
--- a/Numeric/gmshLinearSystemGmm.h
+++ b/Numeric/gmshLinearSystemGmm.h
@@ -3,7 +3,7 @@
// Interface to GMM++
-#include "Message.h"
+#include "GmshMessage.h"
#include "gmshLinearSystem.h"
#if defined(HAVE_GMM)
diff --git a/Numeric/gsl_brent.cpp b/Numeric/gsl_brent.cpp
index f4dcf6693b..59cb3be607 100644
--- a/Numeric/gsl_brent.cpp
+++ b/Numeric/gsl_brent.cpp
@@ -5,7 +5,7 @@
#if defined(HAVE_GSL)
-#include "Message.h"
+#include "GmshMessage.h"
#include "Numeric.h"
#include <gsl/gsl_errno.h>
diff --git a/Numeric/gsl_min.cpp b/Numeric/gsl_min.cpp
index 1975c1dfa6..4a425567f5 100644
--- a/Numeric/gsl_min.cpp
+++ b/Numeric/gsl_min.cpp
@@ -3,7 +3,7 @@
// See the LICENSE.txt file for license information. Please report all
// bugs and problems to <gmsh@geuz.org>.
-#include "Message.h"
+#include "GmshMessage.h"
#if defined(HAVE_GSL)
diff --git a/Numeric/gsl_newt.cpp b/Numeric/gsl_newt.cpp
index 6264e210fe..f8dfc1e3ea 100644
--- a/Numeric/gsl_newt.cpp
+++ b/Numeric/gsl_newt.cpp
@@ -9,7 +9,7 @@
// This implements a Newton method using the GSL.
-#include "Message.h"
+#include "GmshMessage.h"
#if defined(HAVE_GSL)
diff --git a/Parser/Gmsh.tab.cpp b/Parser/Gmsh.tab.cpp
index 1f67ad8246..1672d82748 100644
--- a/Parser/Gmsh.tab.cpp
+++ b/Parser/Gmsh.tab.cpp
@@ -328,7 +328,7 @@
#include <string.h>
#include <stdarg.h>
#include <time.h>
-#include "Message.h"
+#include "GmshMessage.h"
#include "MallocUtils.h"
#include "ListUtils.h"
#include "TreeUtils.h"
diff --git a/Parser/Gmsh.yy.cpp b/Parser/Gmsh.yy.cpp
index 5c619aaccf..2efe86a001 100644
--- a/Parser/Gmsh.yy.cpp
+++ b/Parser/Gmsh.yy.cpp
@@ -832,7 +832,7 @@ char *gmsh_yytext;
#include <stdlib.h>
#include <string.h>
#include <math.h>
-#include "Message.h"
+#include "GmshMessage.h"
#include "Geo.h"
#include "Gmsh.tab.hpp"
diff --git a/Parser/Makefile b/Parser/Makefile
index 00dc30357d..2dbce1c275 100644
--- a/Parser/Makefile
+++ b/Parser/Makefile
@@ -53,7 +53,7 @@ depend:
rm -f Makefile.new
# DO NOT DELETE THIS LINE
-Gmsh.tab.o: Gmsh.tab.cpp ../Common/Message.h ../Common/MallocUtils.h \
+Gmsh.tab.o: Gmsh.tab.cpp ../Common/GmshMessage.h ../Common/MallocUtils.h \
../Common/ListUtils.h ../Common/TreeUtils.h ../Common/avl.h \
../Common/ListUtils.h ../Numeric/Numeric.h ../Numeric/NumericEmbedded.h \
../Common/Context.h ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h \
@@ -75,7 +75,7 @@ Gmsh.tab.o: Gmsh.tab.cpp ../Common/Message.h ../Common/MallocUtils.h \
../Common/CreateFile.h ../Mesh/Field.h ../Post/PView.h \
../Mesh/BackgroundMesh.h ../Post/PViewDataList.h ../Post/PViewData.h \
../Plugin/PluginManager.h
-Gmsh.yy.o: Gmsh.yy.cpp ../Common/Message.h ../Geo/Geo.h \
+Gmsh.yy.o: Gmsh.yy.cpp ../Common/GmshMessage.h ../Geo/Geo.h \
../Common/GmshDefines.h ../Geo/gmshSurface.h ../Geo/Pair.h \
../Geo/Range.h ../Geo/SPoint2.h ../Geo/SPoint3.h ../Geo/SVector3.h \
../Geo/SPoint3.h ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h \
diff --git a/Plugin/Makefile b/Plugin/Makefile
index 0b3f27f9ce..99e676226e 100644
--- a/Plugin/Makefile
+++ b/Plugin/Makefile
@@ -61,11 +61,11 @@ depend:
# DO NOT DELETE THIS LINE
Plugin.o: Plugin.cpp Plugin.h ../Common/Options.h ../Post/ColorTable.h \
- ../Common/Message.h ../Post/PView.h ../Geo/SPoint3.h \
+ ../Common/GmshMessage.h ../Post/PView.h ../Geo/SPoint3.h \
../Post/PViewDataList.h ../Post/PViewData.h ../Geo/SBoundingBox3d.h \
../Geo/SPoint3.h ../Common/ListUtils.h ../Common/GmshMatrix.h
PluginManager.o: PluginManager.cpp Plugin.h ../Common/Options.h \
- ../Post/ColorTable.h ../Common/Message.h ../Post/PView.h \
+ ../Post/ColorTable.h ../Common/GmshMessage.h ../Post/PView.h \
../Geo/SPoint3.h ../Post/PViewDataList.h ../Post/PViewData.h \
../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Common/ListUtils.h \
../Common/GmshMatrix.h PluginManager.h CutMap.h Levelset.h CutGrid.h \
@@ -79,64 +79,64 @@ PluginManager.o: PluginManager.cpp Plugin.h ../Common/Options.h \
../Common/OctreeInternals.h Probe.h FieldView.h GSHHS.h \
../Common/Context.h ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h
Levelset.o: Levelset.cpp Levelset.h Plugin.h ../Common/Options.h \
- ../Post/ColorTable.h ../Common/Message.h ../Post/PView.h \
+ ../Post/ColorTable.h ../Common/GmshMessage.h ../Post/PView.h \
../Geo/SPoint3.h ../Post/PViewDataList.h ../Post/PViewData.h \
../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Common/ListUtils.h \
../Common/GmshMatrix.h MakeSimplex.h ../Numeric/Numeric.h \
../Numeric/NumericEmbedded.h ../Post/adaptiveData.h
CutPlane.o: CutPlane.cpp CutPlane.h Levelset.h Plugin.h \
- ../Common/Options.h ../Post/ColorTable.h ../Common/Message.h \
+ ../Common/Options.h ../Post/ColorTable.h ../Common/GmshMessage.h \
../Post/PView.h ../Geo/SPoint3.h ../Post/PViewDataList.h \
../Post/PViewData.h ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h \
../Common/ListUtils.h ../Common/GmshMatrix.h ../Common/Context.h \
../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h ../Common/GmshUI.h \
../Graphics/Draw.h
CutSphere.o: CutSphere.cpp CutSphere.h Levelset.h Plugin.h \
- ../Common/Options.h ../Post/ColorTable.h ../Common/Message.h \
+ ../Common/Options.h ../Post/ColorTable.h ../Common/GmshMessage.h \
../Post/PView.h ../Geo/SPoint3.h ../Post/PViewDataList.h \
../Post/PViewData.h ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h \
../Common/ListUtils.h ../Common/GmshMatrix.h ../Common/Context.h \
../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h ../Common/GmshUI.h \
../Graphics/Draw.h
CutMap.o: CutMap.cpp CutMap.h Levelset.h Plugin.h ../Common/Options.h \
- ../Post/ColorTable.h ../Common/Message.h ../Post/PView.h \
+ ../Post/ColorTable.h ../Common/GmshMessage.h ../Post/PView.h \
../Geo/SPoint3.h ../Post/PViewDataList.h ../Post/PViewData.h \
../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Common/ListUtils.h \
../Common/GmshMatrix.h ../Common/Context.h ../Geo/CGNSOptions.h \
../Mesh/PartitionOptions.h
Smooth.o: Smooth.cpp Smooth.h Plugin.h ../Common/Options.h \
- ../Post/ColorTable.h ../Common/Message.h ../Post/PView.h \
+ ../Post/ColorTable.h ../Common/GmshMessage.h ../Post/PView.h \
../Geo/SPoint3.h ../Post/PViewDataList.h ../Post/PViewData.h \
../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Common/ListUtils.h \
../Common/GmshMatrix.h
CutParametric.o: CutParametric.cpp ../Post/OctreePost.h \
../Common/Octree.h ../Common/OctreeInternals.h CutParametric.h Plugin.h \
- ../Common/Options.h ../Post/ColorTable.h ../Common/Message.h \
+ ../Common/Options.h ../Post/ColorTable.h ../Common/GmshMessage.h \
../Post/PView.h ../Geo/SPoint3.h ../Post/PViewDataList.h \
../Post/PViewData.h ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h \
../Common/ListUtils.h ../Common/GmshMatrix.h ../Common/Context.h \
../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h ../Common/GmshUI.h \
../Graphics/Draw.h
Lambda2.o: Lambda2.cpp Lambda2.h Plugin.h ../Common/Options.h \
- ../Post/ColorTable.h ../Common/Message.h ../Post/PView.h \
+ ../Post/ColorTable.h ../Common/GmshMessage.h ../Post/PView.h \
../Geo/SPoint3.h ../Post/PViewDataList.h ../Post/PViewData.h \
../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Common/ListUtils.h \
../Common/GmshMatrix.h ../Numeric/Numeric.h \
../Numeric/NumericEmbedded.h
Eigenvectors.o: Eigenvectors.cpp Eigenvectors.h Plugin.h \
- ../Common/Options.h ../Post/ColorTable.h ../Common/Message.h \
+ ../Common/Options.h ../Post/ColorTable.h ../Common/GmshMessage.h \
../Post/PView.h ../Geo/SPoint3.h ../Post/PViewDataList.h \
../Post/PViewData.h ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h \
../Common/ListUtils.h ../Common/GmshMatrix.h ../Numeric/Numeric.h \
../Numeric/NumericEmbedded.h ../Numeric/EigSolve.h
Eigenvalues.o: Eigenvalues.cpp Eigenvalues.h Plugin.h ../Common/Options.h \
- ../Post/ColorTable.h ../Common/Message.h ../Post/PView.h \
+ ../Post/ColorTable.h ../Common/GmshMessage.h ../Post/PView.h \
../Geo/SPoint3.h ../Post/PViewDataList.h ../Post/PViewData.h \
../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Common/ListUtils.h \
../Common/GmshMatrix.h ../Numeric/Numeric.h \
../Numeric/NumericEmbedded.h
StreamLines.o: StreamLines.cpp StreamLines.h Plugin.h ../Common/Options.h \
- ../Post/ColorTable.h ../Common/Message.h ../Post/PView.h \
+ ../Post/ColorTable.h ../Common/GmshMessage.h ../Post/PView.h \
../Geo/SPoint3.h ../Post/PViewDataList.h ../Post/PViewData.h \
../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Common/ListUtils.h \
../Common/GmshMatrix.h ../Post/OctreePost.h ../Common/Octree.h \
@@ -145,18 +145,18 @@ StreamLines.o: StreamLines.cpp StreamLines.h Plugin.h ../Common/Options.h \
../Common/GmshUI.h ../Graphics/Draw.h
CutGrid.o: CutGrid.cpp ../Post/OctreePost.h ../Common/Octree.h \
../Common/OctreeInternals.h CutGrid.h Plugin.h ../Common/Options.h \
- ../Post/ColorTable.h ../Common/Message.h ../Post/PView.h \
+ ../Post/ColorTable.h ../Common/GmshMessage.h ../Post/PView.h \
../Geo/SPoint3.h ../Post/PViewDataList.h ../Post/PViewData.h \
../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Common/ListUtils.h \
../Common/GmshMatrix.h ../Common/Context.h ../Geo/CGNSOptions.h \
../Mesh/PartitionOptions.h ../Common/GmshUI.h ../Graphics/Draw.h
Transform.o: Transform.cpp Transform.h Plugin.h ../Common/Options.h \
- ../Post/ColorTable.h ../Common/Message.h ../Post/PView.h \
+ ../Post/ColorTable.h ../Common/GmshMessage.h ../Post/PView.h \
../Geo/SPoint3.h ../Post/PViewDataList.h ../Post/PViewData.h \
../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Common/ListUtils.h \
../Common/GmshMatrix.h
LongitudeLatitude.o: LongitudeLatitude.cpp LongitudeLatitude.h Plugin.h \
- ../Common/Options.h ../Post/ColorTable.h ../Common/Message.h \
+ ../Common/Options.h ../Post/ColorTable.h ../Common/GmshMessage.h \
../Post/PView.h ../Geo/SPoint3.h ../Post/PViewDataList.h \
../Post/PViewData.h ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h \
../Common/ListUtils.h ../Common/GmshMatrix.h
@@ -169,33 +169,33 @@ Triangulate.o: Triangulate.cpp ../Geo/GModel.h ../Geo/GVertex.h \
../Geo/GEdge.h ../Geo/SPoint2.h ../Geo/SVector3.h ../Geo/Pair.h \
../Geo/GRegion.h ../Geo/GEntity.h ../Geo/SPoint3.h \
../Geo/SBoundingBox3d.h ../Geo/discreteFace.h ../Geo/GModel.h \
- ../Geo/GFace.h ../Mesh/DivideAndConquer.h ../Common/Message.h \
+ ../Geo/GFace.h ../Mesh/DivideAndConquer.h ../Common/GmshMessage.h \
../Geo/MVertex.h ../Geo/SPoint3.h Triangulate.h Plugin.h \
../Common/Options.h ../Post/ColorTable.h ../Post/PView.h \
../Post/PViewDataList.h ../Post/PViewData.h ../Common/ListUtils.h \
../Common/GmshMatrix.h ../Common/Context.h ../Geo/CGNSOptions.h \
../Mesh/PartitionOptions.h
Warp.o: Warp.cpp Warp.h Plugin.h ../Common/Options.h ../Post/ColorTable.h \
- ../Common/Message.h ../Post/PView.h ../Geo/SPoint3.h \
+ ../Common/GmshMessage.h ../Post/PView.h ../Geo/SPoint3.h \
../Post/PViewDataList.h ../Post/PViewData.h ../Geo/SBoundingBox3d.h \
../Geo/SPoint3.h ../Common/ListUtils.h ../Common/GmshMatrix.h \
../Common/SmoothData.h ../Numeric/Numeric.h \
../Numeric/NumericEmbedded.h
SphericalRaise.o: SphericalRaise.cpp SphericalRaise.h Plugin.h \
- ../Common/Options.h ../Post/ColorTable.h ../Common/Message.h \
+ ../Common/Options.h ../Post/ColorTable.h ../Common/GmshMessage.h \
../Post/PView.h ../Geo/SPoint3.h ../Post/PViewDataList.h \
../Post/PViewData.h ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h \
../Common/ListUtils.h ../Common/GmshMatrix.h ../Numeric/Numeric.h \
../Numeric/NumericEmbedded.h
Skin.o: Skin.cpp Skin.h Plugin.h ../Common/Options.h ../Post/ColorTable.h \
- ../Common/Message.h ../Post/PView.h ../Geo/SPoint3.h \
+ ../Common/GmshMessage.h ../Post/PView.h ../Geo/SPoint3.h \
../Post/PViewDataList.h ../Post/PViewData.h ../Geo/SBoundingBox3d.h \
../Geo/SPoint3.h ../Common/ListUtils.h ../Common/GmshMatrix.h \
../Common/TreeUtils.h ../Common/avl.h ../Common/ListUtils.h \
../Common/MallocUtils.h ../Common/Context.h ../Geo/CGNSOptions.h \
../Mesh/PartitionOptions.h
GSHHS.o: GSHHS.cpp GSHHS.h Plugin.h ../Common/Options.h \
- ../Post/ColorTable.h ../Common/Message.h ../Post/PView.h \
+ ../Post/ColorTable.h ../Common/GmshMessage.h ../Post/PView.h \
../Geo/SPoint3.h ../Post/PViewDataList.h ../Post/PViewData.h \
../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Common/ListUtils.h \
../Common/GmshMatrix.h ../Mesh/Field.h ../Geo/GModel.h ../Geo/GVertex.h \
@@ -207,18 +207,18 @@ GSHHS.o: GSHHS.cpp GSHHS.h Plugin.h ../Common/Options.h \
../Geo/SVector3.h ../Geo/Pair.h ../Geo/GRegion.h ../Geo/GEntity.h \
../Geo/SPoint3.h ../Geo/SBoundingBox3d.h
Extract.o: Extract.cpp Extract.h Plugin.h ../Common/Options.h \
- ../Post/ColorTable.h ../Common/Message.h ../Post/PView.h \
+ ../Post/ColorTable.h ../Common/GmshMessage.h ../Post/PView.h \
../Geo/SPoint3.h ../Post/PViewDataList.h ../Post/PViewData.h \
../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Common/ListUtils.h \
../Common/GmshMatrix.h
ExtractElements.o: ExtractElements.cpp ExtractElements.h Plugin.h \
- ../Common/Options.h ../Post/ColorTable.h ../Common/Message.h \
+ ../Common/Options.h ../Post/ColorTable.h ../Common/GmshMessage.h \
../Post/PView.h ../Geo/SPoint3.h ../Post/PViewDataList.h \
../Post/PViewData.h ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h \
../Common/ListUtils.h ../Common/GmshMatrix.h ../Numeric/Numeric.h \
../Numeric/NumericEmbedded.h
ExtractEdges.o: ExtractEdges.cpp ExtractEdges.h Plugin.h \
- ../Common/Options.h ../Post/ColorTable.h ../Common/Message.h \
+ ../Common/Options.h ../Post/ColorTable.h ../Common/GmshMessage.h \
../Post/PView.h ../Geo/SPoint3.h ../Post/PViewDataList.h \
../Post/PViewData.h ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h \
../Common/ListUtils.h ../Common/GmshMatrix.h ../Mesh/BDS.h \
@@ -229,18 +229,18 @@ ExtractEdges.o: ExtractEdges.cpp ExtractEdges.h Plugin.h \
../Geo/SPoint3.h ../Geo/SPoint2.h ../Geo/SPoint2.h ../Geo/SVector3.h \
../Geo/Pair.h
MakeSimplex.o: MakeSimplex.cpp MakeSimplex.h Plugin.h ../Common/Options.h \
- ../Post/ColorTable.h ../Common/Message.h ../Post/PView.h \
+ ../Post/ColorTable.h ../Common/GmshMessage.h ../Post/PView.h \
../Geo/SPoint3.h ../Post/PViewDataList.h ../Post/PViewData.h \
../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Common/ListUtils.h \
../Common/GmshMatrix.h
Evaluate.o: Evaluate.cpp Evaluate.h Plugin.h ../Common/Options.h \
- ../Post/ColorTable.h ../Common/Message.h ../Post/PView.h \
+ ../Post/ColorTable.h ../Common/GmshMessage.h ../Post/PView.h \
../Geo/SPoint3.h ../Post/PViewDataList.h ../Post/PViewData.h \
../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Common/ListUtils.h \
../Common/GmshMatrix.h ../Post/OctreePost.h ../Common/Octree.h \
../Common/OctreeInternals.h
FieldView.o: FieldView.cpp FieldView.h Plugin.h ../Common/Options.h \
- ../Post/ColorTable.h ../Common/Message.h ../Post/PView.h \
+ ../Post/ColorTable.h ../Common/GmshMessage.h ../Post/PView.h \
../Geo/SPoint3.h ../Post/PViewDataList.h ../Post/PViewData.h \
../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Common/ListUtils.h \
../Common/GmshMatrix.h ../Mesh/Field.h ../Geo/GModel.h ../Geo/GVertex.h \
@@ -252,32 +252,32 @@ FieldView.o: FieldView.cpp FieldView.h Plugin.h ../Common/Options.h \
../Geo/SVector3.h ../Geo/Pair.h ../Geo/GRegion.h ../Geo/GEntity.h \
../Geo/SPoint3.h ../Geo/SBoundingBox3d.h
Integrate.o: Integrate.cpp Integrate.h Plugin.h ../Common/Options.h \
- ../Post/ColorTable.h ../Common/Message.h ../Post/PView.h \
+ ../Post/ColorTable.h ../Common/GmshMessage.h ../Post/PView.h \
../Geo/SPoint3.h ../Post/PViewDataList.h ../Post/PViewData.h \
../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Common/ListUtils.h \
../Common/GmshMatrix.h ../Post/shapeFunctions.h ../Numeric/Numeric.h \
../Numeric/NumericEmbedded.h ../Post/PViewOptions.h \
../Post/ColorTable.h
Gradient.o: Gradient.cpp Gradient.h Plugin.h ../Common/Options.h \
- ../Post/ColorTable.h ../Common/Message.h ../Post/PView.h \
+ ../Post/ColorTable.h ../Common/GmshMessage.h ../Post/PView.h \
../Geo/SPoint3.h ../Post/PViewDataList.h ../Post/PViewData.h \
../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Common/ListUtils.h \
../Common/GmshMatrix.h ../Post/shapeFunctions.h ../Numeric/Numeric.h \
../Numeric/NumericEmbedded.h
Curl.o: Curl.cpp Curl.h Plugin.h ../Common/Options.h ../Post/ColorTable.h \
- ../Common/Message.h ../Post/PView.h ../Geo/SPoint3.h \
+ ../Common/GmshMessage.h ../Post/PView.h ../Geo/SPoint3.h \
../Post/PViewDataList.h ../Post/PViewData.h ../Geo/SBoundingBox3d.h \
../Geo/SPoint3.h ../Common/ListUtils.h ../Common/GmshMatrix.h \
../Post/shapeFunctions.h ../Numeric/Numeric.h \
../Numeric/NumericEmbedded.h
Divergence.o: Divergence.cpp Divergence.h Plugin.h ../Common/Options.h \
- ../Post/ColorTable.h ../Common/Message.h ../Post/PView.h \
+ ../Post/ColorTable.h ../Common/GmshMessage.h ../Post/PView.h \
../Geo/SPoint3.h ../Post/PViewDataList.h ../Post/PViewData.h \
../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Common/ListUtils.h \
../Common/GmshMatrix.h ../Post/shapeFunctions.h ../Numeric/Numeric.h \
../Numeric/NumericEmbedded.h
Annotate.o: Annotate.cpp Annotate.h Plugin.h ../Common/Options.h \
- ../Post/ColorTable.h ../Common/Message.h ../Post/PView.h \
+ ../Post/ColorTable.h ../Common/GmshMessage.h ../Post/PView.h \
../Geo/SPoint3.h ../Post/PViewDataList.h ../Post/PViewData.h \
../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Common/ListUtils.h \
../Common/GmshMatrix.h ../Common/Context.h ../Geo/CGNSOptions.h \
@@ -286,24 +286,24 @@ Annotate.o: Annotate.cpp Annotate.h Plugin.h ../Common/Options.h \
../Fltk/Popup_Button.h ../Fltk/SpherePosition_Widget.h ../Mesh/Field.h \
../Graphics/Draw.h
Remove.o: Remove.cpp Remove.h Plugin.h ../Common/Options.h \
- ../Post/ColorTable.h ../Common/Message.h ../Post/PView.h \
+ ../Post/ColorTable.h ../Common/GmshMessage.h ../Post/PView.h \
../Geo/SPoint3.h ../Post/PViewDataList.h ../Post/PViewData.h \
../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Common/ListUtils.h \
../Common/GmshMatrix.h
Probe.o: Probe.cpp Probe.h Plugin.h ../Common/Options.h \
- ../Post/ColorTable.h ../Common/Message.h ../Post/PView.h \
+ ../Post/ColorTable.h ../Common/GmshMessage.h ../Post/PView.h \
../Geo/SPoint3.h ../Post/PViewDataList.h ../Post/PViewData.h \
../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Common/ListUtils.h \
../Common/GmshMatrix.h ../Common/Context.h ../Geo/CGNSOptions.h \
../Mesh/PartitionOptions.h ../Post/OctreePost.h ../Common/Octree.h \
../Common/OctreeInternals.h ../Common/GmshUI.h ../Graphics/Draw.h
HarmonicToTime.o: HarmonicToTime.cpp HarmonicToTime.h Plugin.h \
- ../Common/Options.h ../Post/ColorTable.h ../Common/Message.h \
+ ../Common/Options.h ../Post/ColorTable.h ../Common/GmshMessage.h \
../Post/PView.h ../Geo/SPoint3.h ../Post/PViewDataList.h \
../Post/PViewData.h ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h \
../Common/ListUtils.h ../Common/GmshMatrix.h
ModulusPhase.o: ModulusPhase.cpp ModulusPhase.h Plugin.h \
- ../Common/Options.h ../Post/ColorTable.h ../Common/Message.h \
+ ../Common/Options.h ../Post/ColorTable.h ../Common/GmshMessage.h \
../Post/PView.h ../Geo/SPoint3.h ../Post/PViewDataList.h \
../Post/PViewData.h ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h \
../Common/ListUtils.h ../Common/GmshMatrix.h
diff --git a/Plugin/Plugin.h b/Plugin/Plugin.h
index f16380d327..b1855267ed 100644
--- a/Plugin/Plugin.h
+++ b/Plugin/Plugin.h
@@ -16,7 +16,7 @@
#include <string.h>
#include <stdio.h>
#include "Options.h"
-#include "Message.h"
+#include "GmshMessage.h"
#include "PView.h"
#include "PViewDataList.h"
#include "GmshMatrix.h"
diff --git a/Plugin/Triangulate.cpp b/Plugin/Triangulate.cpp
index 7a4f7c0a43..21eef2371d 100644
--- a/Plugin/Triangulate.cpp
+++ b/Plugin/Triangulate.cpp
@@ -7,7 +7,7 @@
#include "GModel.h"
#include "discreteFace.h"
#include "DivideAndConquer.h"
-#include "Message.h"
+#include "GmshMessage.h"
#include "MVertex.h"
#include "Triangulate.h"
#include "Context.h"
diff --git a/Post/ColorTable.cpp b/Post/ColorTable.cpp
index 7e4f62456e..eb1c171c59 100644
--- a/Post/ColorTable.cpp
+++ b/Post/ColorTable.cpp
@@ -13,7 +13,7 @@
// and Andre Battaiola.
#include <string.h>
-#include "Message.h"
+#include "GmshMessage.h"
#include "ColorTable.h"
#include "Context.h"
#include "Numeric.h"
diff --git a/Post/Makefile b/Post/Makefile
index 15291678de..3bcfb016c1 100644
--- a/Post/Makefile
+++ b/Post/Makefile
@@ -60,7 +60,7 @@ PView.o: PView.cpp PView.h ../Geo/SPoint3.h PViewDataList.h PViewData.h \
../Geo/GRegion.h ../Geo/GEntity.h ../Geo/SPoint3.h \
../Geo/SBoundingBox3d.h PViewOptions.h ColorTable.h \
../Common/VertexArray.h ../Common/SmoothData.h adaptiveData.h \
- ../Common/GmshMatrix.h ../Common/Message.h
+ ../Common/GmshMatrix.h ../Common/GmshMessage.h
PViewIO.o: PViewIO.cpp PView.h ../Geo/SPoint3.h PViewDataList.h \
PViewData.h ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h \
../Common/ListUtils.h PViewDataGModel.h ../Geo/GModel.h \
@@ -71,24 +71,24 @@ PViewIO.o: PViewIO.cpp PView.h ../Geo/SPoint3.h PViewDataList.h \
../Geo/GPoint.h ../Geo/GEdgeLoop.h ../Geo/GEdge.h ../Geo/SPoint2.h \
../Geo/SVector3.h ../Geo/Pair.h ../Geo/GRegion.h ../Geo/GEntity.h \
../Geo/SPoint3.h ../Geo/SBoundingBox3d.h ../Common/StringUtils.h \
- ../Common/Message.h
+ ../Common/GmshMessage.h
PViewData.o: PViewData.cpp PViewData.h ../Geo/SBoundingBox3d.h \
../Geo/SPoint3.h ../Common/ListUtils.h adaptiveData.h \
../Common/GmshMatrix.h ../Numeric/Numeric.h \
- ../Numeric/NumericEmbedded.h ../Common/Message.h
-PViewDataIO.o: PViewDataIO.cpp ../Common/Message.h ../Numeric/Numeric.h \
- ../Numeric/NumericEmbedded.h PViewData.h ../Geo/SBoundingBox3d.h \
- ../Geo/SPoint3.h
+ ../Numeric/NumericEmbedded.h ../Common/GmshMessage.h
+PViewDataIO.o: PViewDataIO.cpp ../Common/GmshMessage.h \
+ ../Numeric/Numeric.h ../Numeric/NumericEmbedded.h PViewData.h \
+ ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h
PViewDataList.o: PViewDataList.cpp PViewDataList.h PViewData.h \
../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Common/ListUtils.h \
../Numeric/Numeric.h ../Numeric/NumericEmbedded.h \
- ../Common/SmoothData.h ../Common/Message.h ../Common/Context.h \
+ ../Common/SmoothData.h ../Common/GmshMessage.h ../Common/Context.h \
../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h
PViewDataListIO.o: PViewDataListIO.cpp PViewDataList.h PViewData.h \
../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Common/ListUtils.h \
- ../Numeric/Numeric.h ../Numeric/NumericEmbedded.h ../Common/Message.h \
- ../Common/Context.h ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h \
- adaptiveData.h ../Common/GmshMatrix.h
+ ../Numeric/Numeric.h ../Numeric/NumericEmbedded.h \
+ ../Common/GmshMessage.h ../Common/Context.h ../Geo/CGNSOptions.h \
+ ../Mesh/PartitionOptions.h adaptiveData.h ../Common/GmshMatrix.h
PViewDataGModel.o: PViewDataGModel.cpp PViewDataGModel.h PViewData.h \
../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Geo/GModel.h \
../Geo/GVertex.h ../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \
@@ -100,10 +100,10 @@ PViewDataGModel.o: PViewDataGModel.cpp PViewDataGModel.h PViewData.h \
../Geo/SPoint3.h ../Geo/SBoundingBox3d.h ../Geo/MElement.h \
../Common/GmshDefines.h ../Geo/MVertex.h ../Geo/SPoint3.h \
../Geo/MEdge.h ../Geo/MVertex.h ../Geo/SVector3.h ../Geo/MFace.h \
- ../Geo/MVertex.h ../Geo/SVector3.h ../Common/Message.h \
+ ../Geo/MVertex.h ../Geo/SVector3.h ../Common/GmshMessage.h \
../Numeric/FunctionSpace.h ../Common/GmshMatrix.h ../Numeric/Numeric.h \
../Numeric/NumericEmbedded.h
-PViewDataGModelIO.o: PViewDataGModelIO.cpp ../Common/Message.h \
+PViewDataGModelIO.o: PViewDataGModelIO.cpp ../Common/GmshMessage.h \
PViewDataGModel.h PViewData.h ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h \
../Geo/GModel.h ../Geo/GVertex.h ../Geo/GEntity.h ../Geo/Range.h \
../Geo/SPoint3.h ../Geo/SBoundingBox3d.h ../Geo/GPoint.h \
@@ -119,9 +119,9 @@ PViewDataGModelIO.o: PViewDataGModelIO.cpp ../Common/Message.h \
../Common/GmshMatrix.h ../Numeric/Numeric.h \
../Numeric/NumericEmbedded.h ../Common/StringUtils.h
PViewOptions.o: PViewOptions.cpp PViewOptions.h ColorTable.h \
- ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Common/Message.h
+ ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Common/GmshMessage.h
adaptiveData.o: adaptiveData.cpp ../Plugin/Plugin.h ../Common/Options.h \
- ../Post/ColorTable.h ../Common/Message.h ../Post/PView.h \
+ ../Post/ColorTable.h ../Common/GmshMessage.h ../Post/PView.h \
../Geo/SPoint3.h ../Post/PViewDataList.h ../Post/PViewData.h \
../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Common/ListUtils.h \
../Common/GmshMatrix.h adaptiveData.h
@@ -136,11 +136,11 @@ OctreePost.o: OctreePost.cpp ../Common/Octree.h \
../Geo/GPoint.h ../Geo/GEdgeLoop.h ../Geo/GEdge.h ../Geo/SPoint2.h \
../Geo/SVector3.h ../Geo/Pair.h ../Geo/GRegion.h ../Geo/GEntity.h \
../Geo/SPoint3.h ../Geo/SBoundingBox3d.h ../Numeric/Numeric.h \
- ../Numeric/NumericEmbedded.h ../Common/Message.h shapeFunctions.h \
+ ../Numeric/NumericEmbedded.h ../Common/GmshMessage.h shapeFunctions.h \
../Geo/MElement.h ../Common/GmshDefines.h ../Geo/MVertex.h \
../Geo/SPoint3.h ../Geo/MEdge.h ../Geo/MVertex.h ../Geo/SVector3.h \
../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h \
../Numeric/FunctionSpace.h ../Common/GmshMatrix.h
-ColorTable.o: ColorTable.cpp ../Common/Message.h ColorTable.h \
+ColorTable.o: ColorTable.cpp ../Common/GmshMessage.h ColorTable.h \
../Common/Context.h ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h \
../Numeric/Numeric.h ../Numeric/NumericEmbedded.h
diff --git a/Post/OctreePost.cpp b/Post/OctreePost.cpp
index 0c19f20cd7..43cf929661 100644
--- a/Post/OctreePost.cpp
+++ b/Post/OctreePost.cpp
@@ -10,7 +10,7 @@
#include "PViewDataList.h"
#include "PViewDataGModel.h"
#include "Numeric.h"
-#include "Message.h"
+#include "GmshMessage.h"
#include "shapeFunctions.h"
#include "GModel.h"
#include "MElement.h"
diff --git a/Post/PView.cpp b/Post/PView.cpp
index 9738072098..7a2113424d 100644
--- a/Post/PView.cpp
+++ b/Post/PView.cpp
@@ -12,7 +12,7 @@
#include "VertexArray.h"
#include "SmoothData.h"
#include "adaptiveData.h"
-#include "Message.h"
+#include "GmshMessage.h"
int PView::_globalNum = 0;
std::vector<PView*> PView::list;
diff --git a/Post/PViewData.cpp b/Post/PViewData.cpp
index bedcbe799f..73031a391f 100644
--- a/Post/PViewData.cpp
+++ b/Post/PViewData.cpp
@@ -7,7 +7,7 @@
#include "ListUtils.h"
#include "adaptiveData.h"
#include "Numeric.h"
-#include "Message.h"
+#include "GmshMessage.h"
PViewData::PViewData()
: _dirty(true), _fileIndex(0), _adaptive(0)
diff --git a/Post/PViewDataGModel.cpp b/Post/PViewDataGModel.cpp
index e57e1e5bc2..edaddc36ae 100644
--- a/Post/PViewDataGModel.cpp
+++ b/Post/PViewDataGModel.cpp
@@ -6,7 +6,7 @@
#include "PViewDataGModel.h"
#include "MElement.h"
#include "Numeric.h"
-#include "Message.h"
+#include "GmshMessage.h"
PViewDataGModel::PViewDataGModel(DataType type)
: PViewData(), _min(VAL_INF), _max(-VAL_INF), _type(type)
diff --git a/Post/PViewDataGModelIO.cpp b/Post/PViewDataGModelIO.cpp
index 4be0c13da7..c3d557edb6 100644
--- a/Post/PViewDataGModelIO.cpp
+++ b/Post/PViewDataGModelIO.cpp
@@ -3,7 +3,7 @@
// See the LICENSE.txt file for license information. Please report all
// bugs and problems to <gmsh@geuz.org>.
-#include "Message.h"
+#include "GmshMessage.h"
#include "PViewDataGModel.h"
#include "MVertex.h"
#include "MElement.h"
diff --git a/Post/PViewDataIO.cpp b/Post/PViewDataIO.cpp
index e7834138ce..68d72bad21 100644
--- a/Post/PViewDataIO.cpp
+++ b/Post/PViewDataIO.cpp
@@ -4,7 +4,7 @@
// bugs and problems to <gmsh@geuz.org>.
#include <string.h>
-#include "Message.h"
+#include "GmshMessage.h"
#include "Numeric.h"
#include "PViewData.h"
diff --git a/Post/PViewDataList.cpp b/Post/PViewDataList.cpp
index d21a975c7a..cd70384a58 100644
--- a/Post/PViewDataList.cpp
+++ b/Post/PViewDataList.cpp
@@ -6,7 +6,7 @@
#include "PViewDataList.h"
#include "Numeric.h"
#include "SmoothData.h"
-#include "Message.h"
+#include "GmshMessage.h"
#include "Context.h"
extern Context_T CTX;
diff --git a/Post/PViewDataListIO.cpp b/Post/PViewDataListIO.cpp
index 53ff502022..6c0935b1d2 100644
--- a/Post/PViewDataListIO.cpp
+++ b/Post/PViewDataListIO.cpp
@@ -7,7 +7,7 @@
#include <set>
#include "PViewDataList.h"
#include "Numeric.h"
-#include "Message.h"
+#include "GmshMessage.h"
#include "Context.h"
#include "adaptiveData.h"
diff --git a/Post/PViewIO.cpp b/Post/PViewIO.cpp
index 7ae79a56d5..9628730b95 100644
--- a/Post/PViewIO.cpp
+++ b/Post/PViewIO.cpp
@@ -7,7 +7,7 @@
#include "PViewDataList.h"
#include "PViewDataGModel.h"
#include "StringUtils.h"
-#include "Message.h"
+#include "GmshMessage.h"
bool PView::readPOS(std::string fileName, int fileIndex)
{
diff --git a/Post/PViewOptions.cpp b/Post/PViewOptions.cpp
index e1289b31e2..66acb7dda2 100644
--- a/Post/PViewOptions.cpp
+++ b/Post/PViewOptions.cpp
@@ -5,7 +5,7 @@
#include <string.h>
#include "PViewOptions.h"
-#include "Message.h"
+#include "GmshMessage.h"
#if defined(HAVE_MATH_EVAL)
#include "matheval.h"
diff --git a/Post/shapeFunctions.h b/Post/shapeFunctions.h
index b7b491ba14..4e76cef47f 100644
--- a/Post/shapeFunctions.h
+++ b/Post/shapeFunctions.h
@@ -7,7 +7,7 @@
#define _SHAPE_FUNCTIONS_H_
#include "Numeric.h"
-#include "Message.h"
+#include "GmshMessage.h"
#define ONE (1. + 1.e-6)
#define ZERO (-1.e-6)
diff --git a/contrib/Chaco/main/Gmsh_printf.cpp b/contrib/Chaco/main/Gmsh_printf.cpp
index 516ae649e6..666d2bf669 100644
--- a/contrib/Chaco/main/Gmsh_printf.cpp
+++ b/contrib/Chaco/main/Gmsh_printf.cpp
@@ -4,7 +4,7 @@
// bugs and problems to <gmsh@geuz.org>.
#include <cstring>
-#include "Message.h"
+#include "GmshMessage.h"
// Overload the printf statements in Chaco to write using Msg::Direct in gmsh
diff --git a/contrib/NR/nrutil.cpp b/contrib/NR/nrutil.cpp
index 64bf6eaa81..0666bc287a 100644
--- a/contrib/NR/nrutil.cpp
+++ b/contrib/NR/nrutil.cpp
@@ -3,7 +3,7 @@
#include <stdio.h>
#include <stddef.h>
#include <stdlib.h>
-#include "Message.h"
+#include "GmshMessage.h"
#define NR_END 1
#define FREE_ARG char*
diff --git a/contrib/Netgen/nglib_addon.cpp b/contrib/Netgen/nglib_addon.cpp
index d36aef21df..2cca9971f9 100644
--- a/contrib/Netgen/nglib_addon.cpp
+++ b/contrib/Netgen/nglib_addon.cpp
@@ -10,7 +10,7 @@ namespace nglib {
using namespace netgen;
#include <iostream>
-#include "Message.h"
+#include "GmshMessage.h"
namespace nglib
{
diff --git a/doc/TODO.txt b/doc/TODO.txt
index d35b436592..beb80c1ca4 100644
--- a/doc/TODO.txt
+++ b/doc/TODO.txt
@@ -1,4 +1,11 @@
-$Id: TODO.txt,v 1.9 2008-11-04 18:21:43 geuzaine Exp $
+$Id: TODO.txt,v 1.10 2008-11-14 17:55:18 geuzaine Exp $
+
+********************************************************************
+
+clarify physical names/ids : physical names are directly mapped to
+integers, without the notion of dimension -> hence, some physical are
+impossible to name (e.g. if Physical Line(1)={..} and Physical
+Surface(1)={...});
********************************************************************
--
GitLab