summaryrefslogtreecommitdiff
path: root/2005/i/robert/src/proto/proto.cc
diff options
context:
space:
mode:
authorhaller2005-04-23 16:54:38 +0000
committerhaller2005-04-23 16:54:38 +0000
commit7a3b4bac691e1b8c5d3f412835ce9b518879a62b (patch)
tree56b6f69a2e439a9e12cacb08cc2670d59fd7fe3d /2005/i/robert/src/proto/proto.cc
parent59bd682764c6274dbb5913e8822334df9c5ef3b9 (diff)
Correction dans proto::wait : on fixe la limite de l'argument timeout à
proto::timeout_
Diffstat (limited to '2005/i/robert/src/proto/proto.cc')
-rw-r--r--2005/i/robert/src/proto/proto.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/2005/i/robert/src/proto/proto.cc b/2005/i/robert/src/proto/proto.cc
index 94704fb..d1ba655 100644
--- a/2005/i/robert/src/proto/proto.cc
+++ b/2005/i/robert/src/proto/proto.cc
@@ -187,7 +187,8 @@ Proto::decode (const Frame &frame, const char *format, int &a0,
bool
Proto::wait (int timeout/*-1*/)
{
- serial_.wait (timeout);
+ // On apelle serial_.wait avec un timeout toujours inf ou gal proto::timeout_
+ serial_.wait (timeout < timeout_ ? timeout : timeout_);
return sync ();
}