Dep/ACE: Upgrade ACE -library to 5.8.3

--HG--
branch : trunk

1 files changed, 12 insertions, 13 deletions

diff --git a/dep/acelite/ace/Sig_Handler.cpp b/dep/acelite/ace/Sig_Handler.cpp
index 8691f817fa0..82ff19ebfa8 100644
--- a/dep/acelite/ace/Sig_Handler.cpp
+++ b/dep/acelite/ace/Sig_Handler.cpp
@@ -1,4 +1,4 @@
-// $Id: Sig_Handler.cpp 88360 2009-12-30 08:42:20Z olli $
+// $Id: Sig_Handler.cpp 91626 2010-09-07 10:59:20Z johnnyw $
 
 #include "ace/Sig_Handler.h"
 #include "ace/Sig_Adapter.h"
@@ -12,7 +12,7 @@
 #include "ace/Sig_Handler.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(ace, Sig_Handler, "$Id: Sig_Handler.cpp 88360 2009-12-30 08:42:20Z olli $")
+
 
 #if defined (ACE_HAS_SIG_C_FUNC)
 
@@ -71,7 +71,7 @@ ACE_Sig_Handler::sig_pending (void)
   ACE_MT (ACE_Recursive_Thread_Mutex *lock =
           ACE_Managed_Object<ACE_Recursive_Thread_Mutex>::get_preallocated_object
           (ACE_Object_Manager::ACE_SIG_HANDLER_LOCK);
-          ACE_Guard<ACE_Recursive_Thread_Mutex> m (*lock));
+          ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, m, *lock, 0));
   return ACE_Sig_Handler::sig_pending_ != 0;
 }
 
@@ -83,7 +83,7 @@ ACE_Sig_Handler::sig_pending (int pending)
   ACE_MT (ACE_Recursive_Thread_Mutex *lock =
           ACE_Managed_Object<ACE_Recursive_Thread_Mutex>::get_preallocated_object
           (ACE_Object_Manager::ACE_SIG_HANDLER_LOCK);
-          ACE_Guard<ACE_Recursive_Thread_Mutex> m (*lock));
+          ACE_GUARD (ACE_Recursive_Thread_Mutex, m, *lock));
   ACE_Sig_Handler::sig_pending_ = pending;
 }
 
@@ -94,7 +94,7 @@ ACE_Sig_Handler::handler (int signum)
   ACE_MT (ACE_Recursive_Thread_Mutex *lock =
     ACE_Managed_Object<ACE_Recursive_Thread_Mutex>::get_preallocated_object
       (ACE_Object_Manager::ACE_SIG_HANDLER_LOCK);
-    ACE_Guard<ACE_Recursive_Thread_Mutex> m (*lock));
+    ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, m, *lock, 0));
 
   if (ACE_Sig_Handler::in_range (signum))
     return ACE_Sig_Handler::signal_handlers_[signum];
@@ -127,7 +127,7 @@ ACE_Sig_Handler::handler (int signum,
   ACE_MT (ACE_Recursive_Thread_Mutex *lock =
     ACE_Managed_Object<ACE_Recursive_Thread_Mutex>::get_preallocated_object
       (ACE_Object_Manager::ACE_SIG_HANDLER_LOCK);
-    ACE_Guard<ACE_Recursive_Thread_Mutex> m (*lock));
+    ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, m, *lock, 0));
 
   return ACE_Sig_Handler::handler_i (signum, new_sh);
 }
@@ -185,7 +185,7 @@ ACE_Sig_Handler::register_handler (int signum,
   ACE_MT (ACE_Recursive_Thread_Mutex *lock =
     ACE_Managed_Object<ACE_Recursive_Thread_Mutex>::get_preallocated_object
       (ACE_Object_Manager::ACE_SIG_HANDLER_LOCK);
-    ACE_Guard<ACE_Recursive_Thread_Mutex> m (*lock));
+    ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, m, *lock, -1));
 
   return ACE_Sig_Handler::register_handler_i (signum,
                                               new_sh,
@@ -206,7 +206,7 @@ ACE_Sig_Handler::remove_handler (int signum,
   ACE_MT (ACE_Recursive_Thread_Mutex *lock =
     ACE_Managed_Object<ACE_Recursive_Thread_Mutex>::get_preallocated_object
       (ACE_Object_Manager::ACE_SIG_HANDLER_LOCK);
-    ACE_Guard<ACE_Recursive_Thread_Mutex> m (*lock));
+    ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, m, *lock, -1));
 
   if (ACE_Sig_Handler::in_range (signum))
     {
@@ -221,7 +221,7 @@ ACE_Sig_Handler::remove_handler (int signum,
       return new_disp->register_action (signum, old_disp);
     }
 
-    return -1;
+  return -1;
 }
 
 // Master dispatcher function that gets called by a signal handler and
@@ -270,8 +270,7 @@ ACE_Sig_Handler::dispatch (int signum,
         // dispatched.  Therefore, to workaround this "feature" we
         // must re-register the <ACE_Event_Handler> with <signum>
         // explicitly.
-        ACE_Sig_Handler::register_handler_i (signum,
-                                             eh);
+        ACE_Sig_Handler::register_handler_i (signum, eh);
 #endif /* ACE_WIN32*/
     }
 }
@@ -345,7 +344,7 @@ ACE_Sig_Handlers::register_handler (int signum,
   ACE_MT (ACE_Recursive_Thread_Mutex *lock =
     ACE_Managed_Object<ACE_Recursive_Thread_Mutex>::get_preallocated_object
       (ACE_Object_Manager::ACE_SIG_HANDLER_LOCK);
-    ACE_Guard<ACE_Recursive_Thread_Mutex> m (*lock));
+    ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, m, *lock, -1));
 
   if (ACE_Sig_Handler::in_range (signum))
     {
@@ -474,7 +473,7 @@ ACE_Sig_Handlers::remove_handler (int signum,
   ACE_MT (ACE_Recursive_Thread_Mutex *lock =
     ACE_Managed_Object<ACE_Recursive_Thread_Mutex>::get_preallocated_object
       (ACE_Object_Manager::ACE_SIG_HANDLER_LOCK);
-    ACE_Guard<ACE_Recursive_Thread_Mutex> m (*lock));
+    ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, m, *lock, -1));
 
   if (ACE_Sig_Handler::in_range (signum))
     {