ChangeLogTag:Tue Nov 23 12:02:53 1999 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu>

3 files changed, 64 insertions, 57 deletions

diff --git a/ChangeLog-99b b/ChangeLog-99b
index 72f9c767b4a..46cf0cad739 100644
--- a/ChangeLog-99b
+++ b/ChangeLog-99b
@@ -1,3 +1,8 @@
+Tue Nov 23 12:02:53 1999  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+	* ace/OS.i: Moved the inline methods for sec()/usec()/msec() so
+	  that are defined *before* they are used...  
+
 Tue Nov 23 11:34:40 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
 
 	* tests/Malloc_Test.cpp (myallocator): Applied ACE_TEXT to several
diff --git a/THANKS b/THANKS
index 2bd9f5968df..417c2f57f52 100644
--- a/THANKS
+++ b/THANKS
@@ -833,6 +833,8 @@ Zach Frey <zfrey@bright.net>
 Ruibiao Qiu <ruibiao@arl.wustl.edu>
 Marcelo Matus <mmatus@dinha.acms.arizona.edu>
 R Seshardi <rseshadri@lucent.com>
+Alexander Belopolsky <belopolsky@my-deja.com>
+Ben Bourner <ben@orion.no> 
 
 I would particularly like to thank Paul Stephenson, who worked with me
 at Ericsson.  Paul devised the recursive Makefile scheme that
diff --git a/ace/OS.i b/ace/OS.i
index 7419c2294e2..27fffd073fd 100644
--- a/ace/OS.i
+++ b/ace/OS.i
@@ -290,6 +290,63 @@ ACE_Time_Value::ACE_Time_Value (long sec, long usec)
   this->normalize ();
 }
 
+// Returns number of seconds.
+
+ACE_INLINE long
+ACE_Time_Value::sec (void) const
+{
+  ACE_TRACE ("ACE_Time_Value::sec");
+  return this->tv_.tv_sec;
+}
+
+// Sets the number of seconds.
+
+ACE_INLINE void
+ACE_Time_Value::sec (long sec)
+{
+  ACE_TRACE ("ACE_Time_Value::sec");
+  this->tv_.tv_sec = sec;
+}
+
+// Converts from Time_Value format into milli-seconds format.
+
+ACE_INLINE long
+ACE_Time_Value::msec (void) const
+{
+  ACE_TRACE ("ACE_Time_Value::msec");
+  return this->tv_.tv_sec * 1000 + this->tv_.tv_usec / 1000;
+}
+
+// Converts from milli-seconds format into Time_Value format.
+
+ACE_INLINE void
+ACE_Time_Value::msec (long milliseconds)
+{
+  ACE_TRACE ("ACE_Time_Value::msec");
+  // Convert millisecond units to seconds;
+  this->tv_.tv_sec = milliseconds / 1000;
+  // Convert remainder to microseconds;
+  this->tv_.tv_usec = (milliseconds - (this->tv_.tv_sec * 1000)) * 1000;
+}
+
+// Returns number of micro-seconds.
+
+ACE_INLINE long
+ACE_Time_Value::usec (void) const
+{
+  ACE_TRACE ("ACE_Time_Value::usec");
+  return this->tv_.tv_usec;
+}
+
+// Sets the number of micro-seconds.
+
+ACE_INLINE void
+ACE_Time_Value::usec (long usec)
+{
+  ACE_TRACE ("ACE_Time_Value::usec");
+  this->tv_.tv_usec = usec;
+}
+
 // True if tv1 > tv2.
 
 ACE_INLINE int
@@ -360,63 +417,6 @@ ACE_Time_Value::ACE_Time_Value (const ACE_Time_Value &tv)
   // ACE_TRACE ("ACE_Time_Value::ACE_Time_Value");
 }
 
-// Returns number of seconds.
-
-ACE_INLINE long
-ACE_Time_Value::sec (void) const
-{
-  ACE_TRACE ("ACE_Time_Value::sec");
-  return this->tv_.tv_sec;
-}
-
-// Sets the number of seconds.
-
-ACE_INLINE void
-ACE_Time_Value::sec (long sec)
-{
-  ACE_TRACE ("ACE_Time_Value::sec");
-  this->tv_.tv_sec = sec;
-}
-
-// Converts from Time_Value format into milli-seconds format.
-
-ACE_INLINE long
-ACE_Time_Value::msec (void) const
-{
-  ACE_TRACE ("ACE_Time_Value::msec");
-  return this->tv_.tv_sec * 1000 + this->tv_.tv_usec / 1000;
-}
-
-// Converts from milli-seconds format into Time_Value format.
-
-ACE_INLINE void
-ACE_Time_Value::msec (long milliseconds)
-{
-  ACE_TRACE ("ACE_Time_Value::msec");
-  // Convert millisecond units to seconds;
-  this->tv_.tv_sec = milliseconds / 1000;
-  // Convert remainder to microseconds;
-  this->tv_.tv_usec = (milliseconds - (this->tv_.tv_sec * 1000)) * 1000;
-}
-
-// Returns number of micro-seconds.
-
-ACE_INLINE long
-ACE_Time_Value::usec (void) const
-{
-  ACE_TRACE ("ACE_Time_Value::usec");
-  return this->tv_.tv_usec;
-}
-
-// Sets the number of micro-seconds.
-
-ACE_INLINE void
-ACE_Time_Value::usec (long usec)
-{
-  ACE_TRACE ("ACE_Time_Value::usec");
-  this->tv_.tv_usec = usec;
-}
-
 // True if tv1 < tv2.
 
 ACE_INLINE int