ChangeLogTag:Fri Jun 1 13:04:31 2001 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu>

9 files changed, 19 insertions, 27 deletions

diff --git a/ace/Makefile b/ace/Makefile
index 54371579a00..01ab99305aa 100644
--- a/ace/Makefile
+++ b/ace/Makefile
@@ -565,12 +565,6 @@ Svc_Conf_l.cpp: Svc_Conf.l
 # ie. (Meta Object compiler) for our QtReactor.h. So, let's do it
 # here.
 
-ifneq ($(QTDIR),)
-  MOC = ${QTDIR}/bin/moc
-else
-  MOC = moc
-endif
-
 ifneq ($(qt_reactor),)
 QtReactor_moc.cpp: QtReactor.h
 	$(MOC) QtReactor.h >QtReactor_moc.cpp
diff --git a/ace/OS.h b/ace/OS.h
index 262aa95f410..8931617fa9b 100644
--- a/ace/OS.h
+++ b/ace/OS.h
@@ -114,19 +114,6 @@ typedef long      id_t;
 #   define ACE_NESTED_CLASS(TYPE, NAME) TYPE::NAME
 # endif /* ! ACE_HAS_BROKEN_NAMESPACES */
 
-#if !defined (VMIN)
-#define ACE_VMIN 4
-#else
-#define ACE_VMIN VMIN
-#endif /* VMIN */
-
-#if !defined (VTIME)
-#define ACE_VTIME 5
-#else
-#define ACE_VTIME VTIME
-#endif /* VTIME */
-
-
 # if !defined (ACE_DEFAULT_CLOSE_ALL_HANDLES)
 #   define ACE_DEFAULT_CLOSE_ALL_HANDLES 1
 # endif /* ACE_DEFAULT_CLOSE_ALL_HANDLES */
@@ -3794,6 +3781,18 @@ extern "C"
 #     endif /* ! __QNX__ */
 #   endif /* ACE_HAS_TERM_IOCTLS */
 
+#if !defined (VMIN)
+#define ACE_VMIN 4
+#else
+#define ACE_VMIN VMIN
+#endif /* VMIN */
+
+#if !defined (VTIME)
+#define ACE_VTIME 5
+#else
+#define ACE_VTIME VTIME
+#endif /* VTIME */
+
 #   if defined (ACE_HAS_AIO_CALLS)
 #     include /**/ <aio.h>
 #   endif /* ACE_HAS_AIO_CALLS */
diff --git a/ace/Proactor.h b/ace/Proactor.h
index 1b07f417084..ddf7b622283 100644
--- a/ace/Proactor.h
+++ b/ace/Proactor.h
@@ -12,7 +12,6 @@
  */
 //=============================================================================
 
-
 #ifndef ACE_PROACTOR_H
 #define ACE_PROACTOR_H
 #include "ace/pre.h"
diff --git a/ace/Timer_Hash_T.h b/ace/Timer_Hash_T.h
index 1584f007f0c..8e7ddc739f1 100644
--- a/ace/Timer_Hash_T.h
+++ b/ace/Timer_Hash_T.h
@@ -166,6 +166,7 @@ public:
   virtual int is_empty (void) const;
 
   /// Returns the time of the earlier node in the <ACE_Timer_Hash>.
+  /// Must be called on a non-empty queue.
   virtual const ACE_Time_Value &earliest_time (void) const;
 
   /**
diff --git a/ace/Timer_Heap_T.h b/ace/Timer_Heap_T.h
index 5329accd376..aa96a1b6e9a 100644
--- a/ace/Timer_Heap_T.h
+++ b/ace/Timer_Heap_T.h
@@ -125,6 +125,7 @@ public:
   virtual int is_empty (void) const;
 
   /// Returns the time of the earliest node in the Timer_Queue.
+  /// Must be called on a non-empty queue.
   virtual const ACE_Time_Value &earliest_time (void) const;
 
   /**
diff --git a/ace/Timer_List_T.h b/ace/Timer_List_T.h
index 4514eb3b753..0a5c19bb81d 100644
--- a/ace/Timer_List_T.h
+++ b/ace/Timer_List_T.h
@@ -109,6 +109,7 @@ public:
   virtual int is_empty (void) const;
 
   /// Returns the time of the earlier node in the <ACE_Timer_List>.
+  /// Must be called on a non-empty queue.
   virtual const ACE_Time_Value &earliest_time (void) const;
 
   /**
diff --git a/ace/Timer_Queue_T.h b/ace/Timer_Queue_T.h
index 6875d0a5a3e..6ffb2ffbab1 100644
--- a/ace/Timer_Queue_T.h
+++ b/ace/Timer_Queue_T.h
@@ -1,6 +1,5 @@
 /* -*- C++ -*- */
 
-
 //=============================================================================
 /**
  *  @file    Timer_Queue_T.h
@@ -196,7 +195,8 @@ public:
   /// True if queue is empty, else false.
   virtual int is_empty (void) const = 0;
 
-  /// Returns the time of the earlier node in the Timer_Queue.
+  /// Returns the time of the earlier node in the Timer_Queue.  Must
+  /// be called on a non-empty queue.
   virtual const ACE_Time_Value &earliest_time (void) const = 0;
 
   /**
diff --git a/ace/Timer_Wheel_T.cpp b/ace/Timer_Wheel_T.cpp
index fdbe32c705c..c1620d633ff 100644
--- a/ace/Timer_Wheel_T.cpp
+++ b/ace/Timer_Wheel_T.cpp
@@ -283,13 +283,9 @@ ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK>::earliest_time (void) const
 {
   ACE_TRACE ("ACE_Timer_Wheel_T::earliest_time");
 
-  if (this->is_empty ())
-    return ACE_Time_Value::zero;
-  else
-    return this->wheel_[this->earliest_pos_]->get_next ()->get_timer_value ();
+  return this->wheel_[this->earliest_pos_]->get_next ()->get_timer_value ();
 }
 
-
 /**
  * Creates a ACE_Timer_Node_T based on the input parameters.  Then inserts
  * the node into the wheel using reschedule ().  Then returns a timer_id
diff --git a/ace/Timer_Wheel_T.h b/ace/Timer_Wheel_T.h
index 9a5b5e72bb5..8548374433a 100644
--- a/ace/Timer_Wheel_T.h
+++ b/ace/Timer_Wheel_T.h
@@ -115,6 +115,7 @@ public:
   virtual int is_empty (void) const;
 
   /// Returns the time of the earlier node in the <ACE_Timer_Wheel>.
+  /// Must be called on a non-empty queue.
   virtual const ACE_Time_Value &earliest_time (void) const;
 
   /// Schedules a timer.