summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorschmidt <douglascraigschmidt@users.noreply.github.com>1998-12-29 16:44:55 +0000
committerschmidt <douglascraigschmidt@users.noreply.github.com>1998-12-29 16:44:55 +0000
commiteabfe8fbdcdced801d8f495d0918540329e5070d (patch)
treef6f1bba90264ea3dbaf617f472f607f28c7a50ca
parentfe95f136f80e1996b2f0320c4b37bdf560d4c145 (diff)
downloadATCD-eabfe8fbdcdced801d8f495d0918540329e5070d.tar.gz
.
-rw-r--r--ChangeLog-98b6
-rw-r--r--README1
-rw-r--r--ace/Proactor.cpp8
3 files changed, 9 insertions, 6 deletions
diff --git a/ChangeLog-98b b/ChangeLog-98b
index 2002a6959d8..d355cc1a8d8 100644
--- a/ChangeLog-98b
+++ b/ChangeLog-98b
@@ -1,3 +1,9 @@
+Tue Dec 29 10:29:03 1998 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu>
+
+ * ace: Fixed a bunch of warnings produced by Intel's C++ 4.0
+ compiler. Thanks to Karel Zuidrveld
+ <kzuiderveld@vitalimages.com> for reporting these.
+
Tue Dec 29 09:47:48 1998 David L. Levine <levine@cs.wustl.edu>
* ace/config-sunos*.h,README:
diff --git a/README b/README
index f5888ab57a3..076282a4cee 100644
--- a/README
+++ b/README
@@ -725,6 +725,7 @@ Peter J. Mason <peterm@fl.net.au>
Jerry De Master <jdemaste@ipdinc.com>
Greg Gallant <greg.gallant@jhuapl.edu>
wym <wym@dekang.com>
+Karel Zuiderveld <kzuiderveld@vitalimages.com>
I would particularly like to thank Paul Stephenson, who worked with me
at Ericsson and is now at ObjectSpace. Paul devised the recursive
diff --git a/ace/Proactor.cpp b/ace/Proactor.cpp
index 1e3d7569750..8af2f91f548 100644
--- a/ace/Proactor.cpp
+++ b/ace/Proactor.cpp
@@ -109,15 +109,11 @@ ACE_Proactor_Timer_Handler::svc (void)
// Time to wait.
time = absolute_time.msec ();
-
- // Make sure the time is positive.
- if (time < 0)
- time = 0;
}
// Wait for event upto <time> milli seconds.
- int result = ::WaitForSingleObject (this->timer_event_.handle (),
- time);
+ u_int result = ::WaitForSingleObject (this->timer_event_.handle (),
+ time);
switch (result)
{
case ACE_WAIT_TIMEOUT: