*** empty log message ***

9 files changed, 19 insertions, 25 deletions

diff --git a/ace/Handle_Set.h b/ace/Handle_Set.h
index ea2751419d2..ef01db484e6 100644
--- a/ace/Handle_Set.h
+++ b/ace/Handle_Set.h
@@ -105,7 +105,7 @@ private:
   void set_max (ACE_HANDLE max);
   // Resets the MAX_FD after a clear of the original MAX_FD.
 
-  static const char nbits_[ACE_Handle_Set::NBITS];
+  static const char nbits_[NBITS];
   // Table that maps bytes to counts of the enabled bits.
 };
 
diff --git a/ace/Log_Priority.h b/ace/Log_Priority.h
index 8294e7844ba..3f7e96a0211 100644
--- a/ace/Log_Priority.h
+++ b/ace/Log_Priority.h
@@ -72,6 +72,11 @@ enum ACE_Log_Priority
   // integral type for this enum is at least 32 bits.
 #if !defined (ACE_HAS_BROKEN_ENUMS)
   ENSURE_32_BITS = 0xFFFFFFFF
+#else
+  ENSURE_32_BITS = 0x1FFFFFFF
+  // HP/CXX makes an error the usage of "long enumerators", but this
+  // one (that requires 29 bits) is OK.... only HP can come up with
+  // something like that...
 #endif /* ACE_HAS_BROKEN_ENUMS */
 };
 
diff --git a/ace/Signal.cpp b/ace/Signal.cpp
index 3c2a73e78f4..9a8917265d3 100644
--- a/ace/Signal.cpp
+++ b/ace/Signal.cpp
@@ -347,7 +347,7 @@ ACE_Sig_Adapter::handle_signal (int signum,
 // There are bugs with HP/UX's C++ compiler that prevents this stuff
 // from compiling...
 #if !defined (ACE_HAS_BROKEN_HPUX_TEMPLATES)
-#define ACE_MAX_SIGNAL_HANDLERS size_t (20)
+#define ACE_MAX_SIGNAL_HANDLERS (const size_t) (20)
 
 // Keeps track of the id that uniquely identifies each registered
 // signal handler.  This id can be used to cancel a timer via the
diff --git a/ace/Stream_Modules.cpp b/ace/Stream_Modules.cpp
index 17c7d40879b..a1d23756a33 100644
--- a/ace/Stream_Modules.cpp
+++ b/ace/Stream_Modules.cpp
@@ -4,8 +4,6 @@
 #if !defined (ACE_STREAM_MODULES_C)
 #define ACE_STREAM_MODULES_C
 
-#if !defined (ACE_LACKS_STREAM_MODULES)
-
 #define ACE_BUILD_DLL
 #include "ace/Stream_Modules.h"
 
diff --git a/ace/Stream_Modules.h b/ace/Stream_Modules.h
index 26e3151ae1a..21a149a961a 100644
--- a/ace/Stream_Modules.h
+++ b/ace/Stream_Modules.h
@@ -14,11 +14,11 @@
 // 
 // ============================================================================
 
+#include "ace/Task.h"
+
 #if !defined (ACE_STREAM_MODULES)
 #define ACE_STREAM_MODULES
 
-#include "ace/Task.h"
-
 template <ACE_SYNCH_1>
 class ACE_Stream_Head : public ACE_Task<ACE_SYNCH_2>
   // = TITLE
diff --git a/ace/Timer_Queue_T.cpp b/ace/Timer_Queue_T.cpp
index e0aec3b7e9c..cfe8060ddfa 100644
--- a/ace/Timer_Queue_T.cpp
+++ b/ace/Timer_Queue_T.cpp
@@ -210,4 +210,10 @@ ACE_Timer_Queue_T<TYPE, FUNCTOR, LOCK>::expire (const ACE_Time_Value &cur_time)
   return number_of_timers_expired;
 }
 
+template <class TYPE, class FUNCTOR, class LOCK> LOCK &
+ACE_Timer_Queue_T<TYPE, FUNCTOR, LOCK>::mutex (void)
+{
+  return this->mutex_;
+}
+
 #endif /* ACE_TIMER_QUEUE_T_C*/
diff --git a/ace/Timer_Queue_T.i b/ace/Timer_Queue_T.i
index c18bfc26f28..752ae8c7d38 100644
--- a/ace/Timer_Queue_T.i
+++ b/ace/Timer_Queue_T.i
@@ -24,7 +24,7 @@ ACE_Timer_Queue_T<TYPE, FUNCTOR, LOCK>::expire (void)
     return 0;
 }
 
-template <class TYPE, class FUNCTOR, class LOCK> void
+template <class TYPE, class FUNCTOR, class LOCK> ACE_INLINE void
 ACE_Timer_Queue_T<TYPE, FUNCTOR, LOCK>::upcall (TYPE &type,
 						const void *act,
 						const ACE_Time_Value &cur_time)
@@ -33,26 +33,20 @@ ACE_Timer_Queue_T<TYPE, FUNCTOR, LOCK>::upcall (TYPE &type,
 }
 
 
-template <class TYPE, class FUNCTOR, class LOCK> ACE_Time_Value
+template <class TYPE, class FUNCTOR, class LOCK> ACE_INLINE ACE_Time_Value
 ACE_Timer_Queue_T<TYPE, FUNCTOR, LOCK>::gettimeofday (void)
 {
   // Invoke gettimeofday via pointer to function.
   return gettimeofday_ ();
 }
 
-template <class TYPE, class FUNCTOR, class LOCK> void
+template <class TYPE, class FUNCTOR, class LOCK> ACE_INLINE void
 ACE_Timer_Queue_T<TYPE, FUNCTOR, LOCK>::gettimeofday (ACE_Time_Value (*gettimeofday)(void))
 {
   gettimeofday_ = gettimeofday;
 }
 
-template <class TYPE, class FUNCTOR, class LOCK> LOCK &
-ACE_Timer_Queue_T<TYPE, FUNCTOR, LOCK>::mutex (void)
-{
-  return this->mutex_;
-}
-
-template <class TYPE, class FUNCTOR, class LOCK> FUNCTOR &
+template <class TYPE, class FUNCTOR, class LOCK> ACE_INLINE FUNCTOR &
 ACE_Timer_Queue_T<TYPE, FUNCTOR, LOCK>::upcall_functor (void)
 {
   return this->upcall_functor_;
diff --git a/ace/config-hpux-10.x-aCC.h b/ace/config-hpux-10.x-aCC.h
index 0e92aca51d2..7e7e7f171c5 100644
--- a/ace/config-hpux-10.x-aCC.h
+++ b/ace/config-hpux-10.x-aCC.h
@@ -12,15 +12,10 @@
 #define HPUX
 #endif /* HPUX */
 
-#if __cplusplus < 199707L
-#define ACE_HAS_BROKEN_HPUX_TEMPLATES
-#endif /* __cplusplus < 199707L */
-
 #define _HPUX_SOURCE
 #include /**/ <sys/stdsyms.h>
 #include /**/ <sched.h> /*  pthread.h doesn't include this */
 
-#define ACE_LACKS_STREAM_MODULES
 #define ACE_HAS_BROKEN_CONVERSIONS
 
 // They forgot a const in the prototype of putmsg and putpmsg...
diff --git a/ace/config-hpux-10.x.h b/ace/config-hpux-10.x.h
index b6abd299df6..07a2b58a28d 100644
--- a/ace/config-hpux-10.x.h
+++ b/ace/config-hpux-10.x.h
@@ -24,10 +24,6 @@
 #define HPUX
 #endif /* HPUX */
 
-#if __cplusplus < 199707L
-#define ACE_HAS_BROKEN_HPUX_TEMPLATES
-#endif /* __cplusplus < 199707L */
-
 // The HP/UX compiler doesn't support volatile!!!!
 #define volatile