*** empty log message ***

3 files changed, 9 insertions, 5 deletions

diff --git a/ace/Message_Queue.cpp b/ace/Message_Queue.cpp
index 2345904720c..e443ca814e8 100644
--- a/ace/Message_Queue.cpp
+++ b/ace/Message_Queue.cpp
@@ -505,6 +505,8 @@ ACE_Message_Queue<ACE_SYNCH_2>::wait_not_full_cond (ACE_Guard<ACE_SYNCH_MUTEX_T>
       mon.acquire ();
     }
 #else
+  ACE_UNUSED_ARG (mon);
+
   // Wait while the queue is full.
 
   while (this->is_full_i ())
@@ -539,6 +541,8 @@ ACE_Message_Queue<ACE_SYNCH_2>::wait_not_empty_cond (ACE_Guard<ACE_SYNCH_MUTEX_T
       mon.acquire ();
     }
 #else
+  ACE_UNUSED_ARG (mon);
+
   // Wait while the queue is empty.
 
   while (this->is_empty_i ())
diff --git a/ace/OS.cpp b/ace/OS.cpp
index 1fab3f74937..02e0115bff9 100644
--- a/ace/OS.cpp
+++ b/ace/OS.cpp
@@ -215,7 +215,7 @@ ACE_OS::gethrtime (void)
   asm ("movl %eax, -4(%ebp)");  // least
   asm ("movl %edx, -8(%ebp)");  // most
 
-  return (u_long long) most << 32  |  least;
+  return (ACE_hrtime_t) most << 32  |  least;
 }
 #endif /* ACE_HAS_PENTIUM && __GNUC__ */
 
diff --git a/ace/Synch.cpp b/ace/Synch.cpp
index b65d69a8a4d..8bab7ea5eba 100644
--- a/ace/Synch.cpp
+++ b/ace/Synch.cpp
@@ -936,14 +936,14 @@ ACE_Static_Object_Lock::instance (void)
       ACE_NEW_RETURN (ACE_Static_Object_Lock::mutex_,
 		      ACE_Recursive_Thread_Mutex, 0);
 #if ! defined (ACE_HAS_BROKEN_ATEXIT)
-      /* On DEC CXX, HP/UX, and AIX.
-         It should be done through the Object_Manager, but then
-         all "statics" will have to play that game as well. */
+      // On DEC CXX, HP/UX, and AIX.  It should be done through the
+      // Object_Manager, but then all "statics" will have to play that
+      // game as well.
 #if defined (ACE_HAS_SIG_C_FUNC)
       ::atexit (ace_static_object_lock_atexit);
 #else
       ::atexit (ACE_Static_Object_Lock::atexit);
-#endif
+#endif /* ACE_HAS_SIG_C_FUNC */
 #endif /* ACE_HAS_BROKEN_ATEXIT */
     }
   return ACE_Static_Object_Lock::mutex_;