From 3315053260a5724fa9d24c95434f0d3c4f33c0c8 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Tue, 17 Apr 2012 14:40:47 +0000
Subject: [PATCH] tentative fix x2
---
Fltk/onelabWindow.cpp | 6 +++---
contrib/MathEx/mathex.cpp | 2 ++
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/Fltk/onelabWindow.cpp b/Fltk/onelabWindow.cpp
index bb81c467b7..1031a58873 100644
--- a/Fltk/onelabWindow.cpp
+++ b/Fltk/onelabWindow.cpp
@@ -204,11 +204,11 @@ bool onelab::localNetworkClient::run()
get(ps, getName() + "/9ComputeCommand");
std::string computeCommand = (ps.empty() ? "" : ps[0].getValue());
if(action == "check")
- command.append(" '" + modelName + "' " + checkCommand) ;
+ command.append(" \"" + modelName + "\" " + checkCommand) ;
else if(action == "compute")
- command.append(" '" + modelName + "' " + computeCommand);
+ command.append(" \"" + modelName + "\" " + computeCommand);
}
- command.append(" " + getSocketSwitch() + " '" + getName() + "' %s");
+ command.append(" " + getSocketSwitch() + " \"" + getName() + "\" %s");
}
else{
Msg::Info("Listening on socket '%s'", sockname.c_str());
diff --git a/contrib/MathEx/mathex.cpp b/contrib/MathEx/mathex.cpp
index 6d1a97e70e..62fdad5a45 100644
--- a/contrib/MathEx/mathex.cpp
+++ b/contrib/MathEx/mathex.cpp
@@ -327,8 +327,10 @@
{ "Tan", tan },
{ "tanh", tanh },
{ "Tanh", tanh },
+#if !defined(WIN32)
{ "atanh", atanh },
{ "Atanh", atanh },
+#endif
{ "trunc", trunc }, // added
{ "Trunc", trunc },
{ "floor", floor }, // largest integer not grather than x
--
GitLab