summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorschmidt <douglascraigschmidt@users.noreply.github.com>2004-02-06 20:15:09 +0000
committerschmidt <douglascraigschmidt@users.noreply.github.com>2004-02-06 20:15:09 +0000
commit601f2570d98b1309a6ab418dfdcf57b98a17eda7 (patch)
treead6ad2a0c4f61b5ac36ff786f59989a98d7ae203
parent5246b6eccbad70f32b6bbb2e0b9c95b4a319d1b1 (diff)
downloadATCD-601f2570d98b1309a6ab418dfdcf57b98a17eda7.tar.gz
ChangeLogTag:Fri Feb 6 14:13:25 2004 Douglas C. Schmidt <schmidt@cs.wustl.edu>
-rw-r--r--ChangeLog7
-rw-r--r--ace/Time_Value.h2
-rw-r--r--ace/Time_Value.inl2
3 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 53ab0c03e69..1fb7d2139ce 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Fri Feb 6 14:13:25 2004 Douglas C. Schmidt <schmidt@cs.wustl.edu>
+
+ * ace/Time_Value.inl (msec): Changed the return type of
+ ACE_Time_Value::msec() from long to unsigned long to prevent
+ problems with wrap-arounds that yield negative numbers. Thanks
+ to gillen@ohio.edu for this fix.
+
Fri Feb 6 11:50:36 2004 Balachandran Natarajan <bala@dre.vanderbilt.edu>
* ace/INET_Addr.cpp:
diff --git a/ace/Time_Value.h b/ace/Time_Value.h
index 1139760390f..ca990e1fd23 100644
--- a/ace/Time_Value.h
+++ b/ace/Time_Value.h
@@ -157,7 +157,7 @@ public:
* usec() methods. There is no analogous "millisecond"
* component in an ACE_Time_Value.
*/
- long msec (void) const;
+ unsigned long msec (void) const;
/// Converts from milli-seconds format into ACE_Time_Value format.
/**
diff --git a/ace/Time_Value.inl b/ace/Time_Value.inl
index e46354291f6..5ba6a4b4040 100644
--- a/ace/Time_Value.inl
+++ b/ace/Time_Value.inl
@@ -113,7 +113,7 @@ ACE_Time_Value::sec (long sec)
// Converts from Time_Value format into milli-seconds format.
-ACE_INLINE long
+ACE_INLINE unsigned long
ACE_Time_Value::msec (void) const
{
// ACE_OS_TRACE ("ACE_Time_Value::msec");