From 9ca63c56d54b2087aca277e1b44e1f5778689a97 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Sun, 1 Feb 2009 12:01:42 +0000
Subject: [PATCH] *** empty log message ***
---
Common/GmshSocket.h | 6 +++---
Fltk/Solvers.cpp | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/Common/GmshSocket.h b/Common/GmshSocket.h
index 49d43be628..4513b11e10 100644
--- a/Common/GmshSocket.h
+++ b/Common/GmshSocket.h
@@ -286,7 +286,7 @@ class GmshServer : public GmshSocket{
virtual ~GmshServer(){}
virtual int SystemCall(const char *str) = 0;
virtual int NonBlockingWait(int socket, int num, double waitint) = 0;
- int StartClient(const char *command, const char *sockname=0, int maxdelay=4)
+ int StartClient(const char *command, const char *sockname=0, int timeout=5)
{
bool justwait = (!command || !strlen(command));
_sockname = sockname;
@@ -365,9 +365,9 @@ class GmshServer : public GmshSocket{
}
}
else{
- // Wait at most maxdelay seconds for data, issue error if no
+ // Wait at most timeout seconds for data, issue error if no
// connection in that amount of time
- if(!Select(tmpsock, maxdelay, 0)){
+ if(!Select(tmpsock, timeout, 0)){
CloseSocket(tmpsock);
return -4; // Error: Socket listening timeout
}
diff --git a/Fltk/Solvers.cpp b/Fltk/Solvers.cpp
index a7dd432182..391ca8aa91 100644
--- a/Fltk/Solvers.cpp
+++ b/Fltk/Solvers.cpp
@@ -82,7 +82,7 @@ int Solver(int num, const char *args)
#if !defined(WIN32)
command += " &";
#endif
- server->StartClient(command.c_str(), 0, 4.0);
+ server->StartClient(command.c_str());
return 1;
}
}
@@ -125,7 +125,7 @@ int Solver(int num, const char *args)
#endif
}
- int sock = server->StartClient(command.c_str(), sockname.c_str(), 4.0);
+ int sock = server->StartClient(command.c_str(), sockname.c_str());
if(sock < 0) {
switch (sock) {
--
GitLab