*** empty log message ***

10 files changed, 77 insertions, 60 deletions

diff --git a/ace/DEV_IO.h b/ace/DEV_IO.h
index 60368bf1d1e..c561a21ed72 100644
--- a/ace/DEV_IO.h
+++ b/ace/DEV_IO.h
@@ -1,7 +1,6 @@
 /* -*- C++ -*- */
 // $Id$
 
-
 // ============================================================================
 //
 // = LIBRARY
@@ -53,7 +52,7 @@ public:
   ssize_t send (const ACE_Str_Buf *cntl, 
 		const ACE_Str_Buf *data, 
 		int band, 
-		int flags = 0) const;
+		int flags) const;
   // Send bytes via STREAM pipes using "band" mode.
 
   ssize_t recv (ACE_Str_Buf *cntl, 
diff --git a/ace/Dump.cpp b/ace/Dump.cpp
index 28118f24ca9..7e0f742fbea 100644
--- a/ace/Dump.cpp
+++ b/ace/Dump.cpp
@@ -41,7 +41,7 @@ ACE_Dumpable_Ptr::operator= (const ACE_Dumpable *dumper) const
   ACE_TRACE ("ACE_Dumpable_Ptr::operator=");
   if (this->dumper_ != dumper) 
     {
-      delete (ACE_Dumpable_Ptr *) this->dumper_;
+      delete (ACE_Dumpable *) this->dumper_;
       ((ACE_Dumpable_Ptr *) this)->dumper_ = dumper;
     }
 }
diff --git a/ace/Map_Manager.cpp b/ace/Map_Manager.cpp
index 4e200705549..245772bbc0f 100644
--- a/ace/Map_Manager.cpp
+++ b/ace/Map_Manager.cpp
@@ -670,7 +670,7 @@ ACE_Map_Reverse_Iterator<EXT_ID, INT_ID, LOCK>::advance (void)
        && this->map_man_.search_structure_[this->next_].is_free_;
        this->next_--)
     continue;
-  return size_t (this->next_) >= 0;
+  return this->next_ >= 0;
 }
 
 #endif /* ACE_MAP_MANAGER_C */
diff --git a/ace/Reactor.h b/ace/Reactor.h
index d881bdc6a64..d1fddb5103b 100644
--- a/ace/Reactor.h
+++ b/ace/Reactor.h
@@ -602,25 +602,26 @@ protected:
   // Do the work of actually binding the <handle> and <eh> with the
   // <mask>.
 
+  virtual int register_handler_i (const ACE_Handle_Set &handles, 
+				  ACE_Event_Handler *handler, 
+				  ACE_Reactor_Mask mask);
+  // Register a set of <handles>.
+
   virtual int remove_handler_i (ACE_HANDLE handle, 
 				ACE_Reactor_Mask);
   // Do the work of actually unbinding the <handle> and <eh> with the
   // <mask>.
 
+  virtual int remove_handler_i (const ACE_Handle_Set &handles, 
+				ACE_Reactor_Mask);
+  // Remove a set of <handles>.
+
   virtual int suspend_i (ACE_HANDLE handle);
   // Suspend the <Event_Handler> associated with <handle>
+
   virtual int resume_i (ACE_HANDLE handle);
   // Resume the <Event_Handler> associated with <handle>
 
-  virtual int remove_handler_i (const ACE_Handle_Set &handles, 
-				 ACE_Reactor_Mask);
-  // Remove a set of <handles>.
-
-  virtual int register_handler_i (const ACE_Handle_Set &handles, 
-				  ACE_Event_Handler *handler, 
-				  ACE_Reactor_Mask mask);
-  // Register a set of <handles>.
-
   virtual int handler_i (ACE_HANDLE handle, 
 			  ACE_Reactor_Mask, 
 			  ACE_Event_Handler ** = 0);
diff --git a/ace/SPIPE_Stream.h b/ace/SPIPE_Stream.h
index 96a3cd2a02f..54b40bf71df 100644
--- a/ace/SPIPE_Stream.h
+++ b/ace/SPIPE_Stream.h
@@ -68,7 +68,7 @@ public:
   ssize_t send (const ACE_Str_Buf *cntl, 
 		const ACE_Str_Buf *data,
 		int band, 
-		int flags = 0) const;
+		int flags) const;
   // Send bytes via STREAM pipes using "band" mode.
 
   ssize_t recv (ACE_Str_Buf *cntl, 
diff --git a/ace/XtReactor.cpp b/ace/XtReactor.cpp
index 95026865193..4a40fef52f3 100644
--- a/ace/XtReactor.cpp
+++ b/ace/XtReactor.cpp
@@ -299,7 +299,7 @@ void ACE_XtReactor::reset_timeout (void)
     }
 }
 
-int
+long
 ACE_XtReactor::schedule_timer (ACE_Event_Handler *handler, 
 			       const void *arg,
 			       const ACE_Time_Value &delta_time, 
@@ -308,14 +308,16 @@ ACE_XtReactor::schedule_timer (ACE_Event_Handler *handler,
   ACE_TRACE ("ACE_XtReactor::schedule_timer");
   ACE_MT (ACE_GUARD_RETURN (ACE_REACTOR_MUTEX, ace_mon, this->token_, -1));
 
-  int result = 
+  long result = 
     ACE_Reactor::schedule_timer (handler, arg, delta_time, interval);
 
   if (result == -1)
-    return result;
-
-  this->reset_timeout ();
-  return result;
+    return -1;
+  else
+    {
+      this->reset_timeout ();
+      return result;
+    }
 }
 
 int
@@ -324,31 +326,32 @@ ACE_XtReactor::cancel_timer (ACE_Event_Handler *handler,
 {
   ACE_TRACE ("ACE_XtReactor::cancel_timer");
 
-  int result = ACE_Reactor::cancel_timer (handler, 
-					  dont_call_handle_close);
-      
-  if (result == -1)
+  if (ACE_Reactor::cancel_timer (handler, 
+				 dont_call_handle_close) == -1)
     return -1;
-
-  this->reset_timeout ();
-  return 0;
+  else
+    {
+      this->reset_timeout ();
+      return 0;
+    }
 }
 
 int
-ACE_XtReactor::cancel_timer (int timer_id, 
+ACE_XtReactor::cancel_timer (long timer_id, 
 			     const void **arg,
 			     int dont_call_handle_close)
 {
   ACE_TRACE ("ACE_XtReactor::cancel_timer");
 
-  int result = ACE_Reactor::cancel_timer (timer_id, 
-					  arg,
-					  dont_call_handle_close);
-  if (result == -1)
+  if (ACE_Reactor::cancel_timer (timer_id, 
+				 arg,
+				 dont_call_handle_close) == -1)
     return -1;
-
-  this->reset_timeout ();
-  return 0;
+  else
+    {
+      this->reset_timeout ();
+      return 0;
+    }
 }
 
 #endif /* ACE_HAS_XT */
diff --git a/ace/XtReactor.h b/ace/XtReactor.h
index f9d289e70d2..bf7ffde7e6d 100644
--- a/ace/XtReactor.h
+++ b/ace/XtReactor.h
@@ -49,41 +49,42 @@ public:
 
   XtAppContext context (void);
 
-  // Register timers/handles with Xt.
+  // = Timer operations.
+  virtual long schedule_timer (ACE_Event_Handler *handler, 
+			       const void *arg,
+			       const ACE_Time_Value &delta_time, 
+			       const ACE_Time_Value &interval);
+
+  virtual int cancel_timer (ACE_Event_Handler *handler,
+			    int dont_call_handle_close = 1);
+
+  virtual int cancel_timer (long timer_id, 
+			    const void **arg = 0,
+			    int dont_call_handle_close = 1);
+
+protected:
+  // = Register timers/handles with Xt.
   virtual int register_handler_i (ACE_HANDLE handle, 
 				  ACE_Event_Handler *handler,
 				  ACE_Reactor_Mask mask);
+  // Register a single <handler>.
 
   virtual int register_handler_i (const ACE_Handle_Set &handles, 
 				  ACE_Event_Handler *handler, 
 				  ACE_Reactor_Mask mask);
-  // Register a set of <handles>.
+  // Register a set of <handlers>.
 
   virtual int remove_handler_i (ACE_HANDLE handle, ACE_Reactor_Mask mask);
-
-  virtual int schedule_timer (ACE_Event_Handler *handler, 
-		              const void *arg,
-		              const ACE_Time_Value &delta_time, 
-		              const ACE_Time_Value &interval);
-
-  virtual int cancel_timer (ACE_Event_Handler *handler,
-			    int dont_call_handle_close = 1);
-  virtual int cancel_timer (int timer_id, 
-			    const void **arg = 0,
-			    int dont_call_handle_close = 1);
-
-protected:
+  // Remove the <handler> associated with this <handle>.
 
   virtual int wait_for_multiple_events (ACE_Reactor_Handle_Set &,
 					ACE_Time_Value *); 
+  // Wait for events to occur.
 
   virtual int XtWaitForMultipleEvents (int, 
 				       ACE_Reactor_Handle_Set &,
 				       ACE_Time_Value *); 
 
-  ACE_XtReactor (const ACE_Reactor &);
-  ACE_XtReactor &operator = (const ACE_Reactor &);
-
   XtAppContext context_;
   struct ACE_XtReactorID *ids_;
   int id_len_;
@@ -91,8 +92,14 @@ protected:
 
 private:
   void reset_timeout (void);
+
+  // = Integrate with the X callback function mechanism.
   static void TimerCallbackProc (XtPointer closure, XtIntervalId *id);
   static void InputCallbackProc (XtPointer closure, int* source, XtInputId *id);
+
+  // = Disable copying and assignment.
+  ACE_XtReactor (const ACE_Reactor &);
+  void operator = (const ACE_Reactor &);
 };
 #endif /* ACE_HAS_XT */
 
diff --git a/ace/config-hpux-10.x-aCC.h b/ace/config-hpux-10.x-aCC.h
index a87926e5f33..e2fe98a2eb0 100644
--- a/ace/config-hpux-10.x-aCC.h
+++ b/ace/config-hpux-10.x-aCC.h
@@ -2,7 +2,6 @@
 // $Id$
 
 // The following configuration file is designed to work for HP
-// platforms running HP/UX 10.x.  For using HP C++ compiler with
 // platforms running HP/UX 10.x and using the HP/aCC compiler.
 
 #if !defined (ACE_CONFIG_H)
@@ -19,7 +18,7 @@
 
 #define _HPUX_SOURCE
 #include /**/ <sys/stdsyms.h>
-#include /**/ <sched.h>                              /*  pthread.h doesn't include this */
+#include /**/ <sched.h> /*  pthread.h doesn't include this */
 
 #define ACE_HAS_BROKEN_CONVERSIONS
 
diff --git a/ace/config-hpux-10.x-g++.h b/ace/config-hpux-10.x-g++.h
index e15296019d1..72544476fcb 100644
--- a/ace/config-hpux-10.x-g++.h
+++ b/ace/config-hpux-10.x-g++.h
@@ -19,9 +19,6 @@
 // They forgot a const in the prototype of putmsg and putpmsg...
 #define ACE_LACKS_CONST_STRBUF_PTR
 
-// They forgot a const in the prototype of const_timewait...
-#define ACE_LACKS_CONST_TIMESPEC_PTR
-
 // Compiler's template mechanism must see source code (i.e., .C files).
 #define ACE_TEMPLATES_REQUIRE_SOURCE
 // Compiler doesn't support static data member templates.
diff --git a/ace/config-hpux-10.x.h b/ace/config-hpux-10.x.h
index aca9d393d3c..78158d3eec6 100644
--- a/ace/config-hpux-10.x.h
+++ b/ace/config-hpux-10.x.h
@@ -2,8 +2,19 @@
 // $Id$
 
 // The following configuration file is designed to work for HP
-// platforms running HP/UX 10.x.  For using HP C++ compiler with
-// templates you should have patch PHSS_6246.
+// platforms running HP/UX 10.x.
+// To use HP/C++ you need some patches, the following set
+//
+// PHSS_9855
+// PHSS_9096
+// PHSS_10261
+// PHSS_9062
+// PHSS_7505
+// PHSS_8490
+//
+// worked for me (Carlos O'Ryan), but you should check by yourself.
+// The most important one is PHSS_9855, but in depends on some of the
+// others.
 
 #if !defined (ACE_CONFIG_H)
 #define ACE_CONFIG_H