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

15 files changed, 136 insertions, 49 deletions

diff --git a/ChangeLog b/ChangeLog
index a129960410b..75f4c4a5217 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,34 @@
+Fri Jun  1 13:04:31 2001  Douglas C. Schmidt  <schmidt@tango.doc.wustl.edu>
+
+        * ace/Makefile:
+          Removed the moc compiler path definition from ace/Makefile
+ 	  since it is now in include/makeinclude/wrapper_macros.GNU
+	  Thanks to Hans Utz <hans.utz@informatik.uni-ulm.de> for
+	  reporting this. 
+  
+	* include/makeinclude/wrapper_macros.GNU (YACC): Added the moc
+	  compiler path definition to include/makeinclude/wrapper_macros.GNU 
+	  Thanks to Hans Utz <hans.utz@informatik.uni-ulm.de> for
+	  reporting this. 
+
+	* ace/Timer_Wheel_T.cpp: Removed check to see if Timer_Wheel was
+	  empty from earliest_time().
+
+	* ace/Timer_List_T.h,
+  	* ace/Timer_Hash_T.h,
+  	* ace/Timer_Heap_T.h,
+	* ace/Timer_Queue_T.h,
+	* ace/Timer_Wheel_T.h:
+	  Added a comment to point out that earliest_time() can only be
+ 	  called on a non-empty queue.  Thanks to Gil Rapaport
+ 	  <grapaport@comgates.co.il> for reporting this.
+
+Tue May 29 17:38:15 2001  Douglas C. Schmidt  <schmidt@lambada.cs.wustl.edu>
+
+	* ace/OS.h: Moved the VMIN and VMAX macros to the right place.
+	  Thanks to Hans Utz <hans.utz@informatik.uni-ulm.de> for
+ 	  reporting this.
+
 Fri Jun  1 16:11:42 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
 
 	* ace/Acceptor.cpp (open): Enabled the socket to be non-blocking
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index a129960410b..75f4c4a5217 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,34 @@
+Fri Jun  1 13:04:31 2001  Douglas C. Schmidt  <schmidt@tango.doc.wustl.edu>
+
+        * ace/Makefile:
+          Removed the moc compiler path definition from ace/Makefile
+ 	  since it is now in include/makeinclude/wrapper_macros.GNU
+	  Thanks to Hans Utz <hans.utz@informatik.uni-ulm.de> for
+	  reporting this. 
+  
+	* include/makeinclude/wrapper_macros.GNU (YACC): Added the moc
+	  compiler path definition to include/makeinclude/wrapper_macros.GNU 
+	  Thanks to Hans Utz <hans.utz@informatik.uni-ulm.de> for
+	  reporting this. 
+
+	* ace/Timer_Wheel_T.cpp: Removed check to see if Timer_Wheel was
+	  empty from earliest_time().
+
+	* ace/Timer_List_T.h,
+  	* ace/Timer_Hash_T.h,
+  	* ace/Timer_Heap_T.h,
+	* ace/Timer_Queue_T.h,
+	* ace/Timer_Wheel_T.h:
+	  Added a comment to point out that earliest_time() can only be
+ 	  called on a non-empty queue.  Thanks to Gil Rapaport
+ 	  <grapaport@comgates.co.il> for reporting this.
+
+Tue May 29 17:38:15 2001  Douglas C. Schmidt  <schmidt@lambada.cs.wustl.edu>
+
+	* ace/OS.h: Moved the VMIN and VMAX macros to the right place.
+	  Thanks to Hans Utz <hans.utz@informatik.uni-ulm.de> for
+ 	  reporting this.
+
 Fri Jun  1 16:11:42 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
 
 	* ace/Acceptor.cpp (open): Enabled the socket to be non-blocking
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index a129960410b..75f4c4a5217 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,34 @@
+Fri Jun  1 13:04:31 2001  Douglas C. Schmidt  <schmidt@tango.doc.wustl.edu>
+
+        * ace/Makefile:
+          Removed the moc compiler path definition from ace/Makefile
+ 	  since it is now in include/makeinclude/wrapper_macros.GNU
+	  Thanks to Hans Utz <hans.utz@informatik.uni-ulm.de> for
+	  reporting this. 
+  
+	* include/makeinclude/wrapper_macros.GNU (YACC): Added the moc
+	  compiler path definition to include/makeinclude/wrapper_macros.GNU 
+	  Thanks to Hans Utz <hans.utz@informatik.uni-ulm.de> for
+	  reporting this. 
+
+	* ace/Timer_Wheel_T.cpp: Removed check to see if Timer_Wheel was
+	  empty from earliest_time().
+
+	* ace/Timer_List_T.h,
+  	* ace/Timer_Hash_T.h,
+  	* ace/Timer_Heap_T.h,
+	* ace/Timer_Queue_T.h,
+	* ace/Timer_Wheel_T.h:
+	  Added a comment to point out that earliest_time() can only be
+ 	  called on a non-empty queue.  Thanks to Gil Rapaport
+ 	  <grapaport@comgates.co.il> for reporting this.
+
+Tue May 29 17:38:15 2001  Douglas C. Schmidt  <schmidt@lambada.cs.wustl.edu>
+
+	* ace/OS.h: Moved the VMIN and VMAX macros to the right place.
+	  Thanks to Hans Utz <hans.utz@informatik.uni-ulm.de> for
+ 	  reporting this.
+
 Fri Jun  1 16:11:42 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
 
 	* ace/Acceptor.cpp (open): Enabled the socket to be non-blocking
diff --git a/THANKS b/THANKS
index 7d18697370e..15b53b196ba 100644
--- a/THANKS
+++ b/THANKS
@@ -1250,6 +1250,8 @@ Brodie Thiesfield <brodie.thiesfield@activesky.com>
 Erik Toubro Nielsen <enielsen@mdsproteomics.dk>
 Masaoud T. Moonim <masaoud@mailandnews.com>
 Steve Witten <steve_witten@hp.com>
+Gil Rapaport <grapaport@comgates.co.il>
+Boris Temkin <borist@allcharge.com>
 
 I would particularly like to thank Paul Stephenson, who worked with me
 at Ericsson in the early 1990's.  Paul devised the recursive Makefile
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.
diff --git a/include/makeinclude/wrapper_macros.GNU b/include/makeinclude/wrapper_macros.GNU
index bdbd1c912e8..ff1ea24aaf2 100644
--- a/include/makeinclude/wrapper_macros.GNU
+++ b/include/makeinclude/wrapper_macros.GNU
@@ -413,6 +413,12 @@ ifneq ($(qt_reactor),)
   LDFLAGS += $(PLATFORM_QT_LDFLAGS)
 endif # qt_reactor
 
+ifneq ($(QTDIR),)
+  MOC = ${QTDIR}/bin/moc
+else
+  MOC = moc
+endif
+
 ifeq ($(gtk_reactor),0)
   override gtk_reactor =
 endif # gtk_reactor
diff --git a/tests/CDR_File_Test.cpp b/tests/CDR_File_Test.cpp
index 0c4aebf3de0..9100a1c31bc 100644
--- a/tests/CDR_File_Test.cpp
+++ b/tests/CDR_File_Test.cpp
@@ -79,11 +79,11 @@ operator << (ostream &os,
 
   os << "ULongLong 1st half: "
      << hex
-     << ACE_U64_TO_U32(hi)
+     << ACE_U64_TO_U32 (hi)
      << dec << endl
      << "ULongLong 2nd half: "
      << hex
-     << ACE_U64_TO_U32(lo)
+     << ACE_U64_TO_U32 (lo)
      << dec << endl
      << "Float:             " << t.fpoint_ << endl
      << "Double:            " << t.dprec_ << endl;
@@ -91,7 +91,7 @@ operator << (ostream &os,
 }
 
 CDR_Test::CDR_Test (void)
-  : char_  (0),
+  : char_ (0),
     word2_ (0),
     word4_ (0),
     word8_ (0),
@@ -198,7 +198,7 @@ run_test (int write_file,
 
       n = file.send (output_mb->rd_ptr (),
                      output_mb->length ());
-      if (n != (size_t) output_mb->length())
+      if (n != (size_t) output_mb->length ())
         ACE_ERROR_RETURN ((LM_ERROR,
                            ACE_TEXT ("send failed on %p\n"),
                            filename),
@@ -281,13 +281,13 @@ run_test (int write_file,
 }
 
 static void
-usage(ACE_TCHAR* cmd)
+usage (ACE_TCHAR *cmd)
 {
   ACE_ERROR ((LM_ERROR,
               ACE_TEXT ("Usage: %s ")
               ACE_TEXT ("[-f filename [-w|-r]]"),
               cmd));
-  ACE_OS::exit(1);
+  ACE_OS::exit (1);
 }
 
 // Main function
@@ -299,9 +299,9 @@ main (int argc, ACE_TCHAR *argv[])
 
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("This is ACE Version %u.%u.%u\n\n"),
-              ACE::major_version(),
-              ACE::minor_version(),
-              ACE::beta_version()));
+              ACE::major_version (),
+              ACE::minor_version (),
+              ACE::beta_version ()));
 
   ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("f:rw"));
   int opt;
@@ -323,26 +323,20 @@ main (int argc, ACE_TCHAR *argv[])
           break;
         case '?':
         default:
-          usage(argv[0]);
+          usage (argv[0]);
         }
     }
 
   if ((!reading || !writing) && fn == 0)
-    {
-      usage(argv[0]);
-    }
+    usage (argv[0]);
 
   if (!reading && !writing)
-    {
-      usage(argv[0]);
-    }
+    usage (argv[0]);
 
   // Create a temporary filename.
-  ACE_FILE_Addr filename(ACE_sap_any_cast (ACE_FILE_Addr &));
+  ACE_FILE_Addr filename (ACE_sap_any_cast (ACE_FILE_Addr &));
   if (fn != 0)
-    {
-      filename.set (fn);
-    }
+    filename.set (fn);
 
 
   ACE_FILE_Connector connector;
@@ -354,7 +348,7 @@ main (int argc, ACE_TCHAR *argv[])
                          0,
                          ACE_Addr::sap_any,
                          0,
-                         ((writing) ? (O_RDWR | O_CREAT) : O_RDONLY),
+ ((writing) ? (O_RDWR | O_CREAT) : O_RDONLY),
                          ACE_DEFAULT_FILE_PERMS) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
                        ACE_TEXT ("connect failed for %p\n"),
@@ -366,7 +360,7 @@ main (int argc, ACE_TCHAR *argv[])
 # define TEST_CAN_UNLINK_IN_ADVANCE
 #endif
 
-#if defined(TEST_CAN_UNLINK_IN_ADVANCE)
+#if defined (TEST_CAN_UNLINK_IN_ADVANCE)
   if (fn == 0)
     {
       // Unlink this file right away so that it is automatically removed