From 6a25de949d23ff142e9fdee5b1363665169ce6e0 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Thu, 22 Jan 2009 15:45:13 +0000 Subject: Fri Jan 22 15:44:01 UTC 2009 Johnny Willemsen * ace/Log_Msg.h: Only define the ACE_DEBUG/ACE_ERROR* when they are not defined yet when ACE_NLOGGING is defined. This makes it possible for users to globally disable logging but then just enable ACE_ERROR * ace/Message_Block.cpp: Code layout changes * ace/SOCK_IO.cpp: * ace/SOCK_Dgram.cpp: * ace/Select_Reactor_T.cpp: Just define select_width twice and directly assign it * ace/OS_NS_sys_socket.inl: Move local variables into the loop * ace/config-sunos5.9.h: * ace/config-linux-common.h: Define ACE_HAS_SENDFILE to 1 --- ACE/ace/Message_Block.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'ACE/ace/Message_Block.cpp') diff --git a/ACE/ace/Message_Block.cpp b/ACE/ace/Message_Block.cpp index 8a73512f3c2..78594a04442 100644 --- a/ACE/ace/Message_Block.cpp +++ b/ACE/ace/Message_Block.cpp @@ -815,8 +815,10 @@ ACE_Data_Block::release_no_delete (ACE_Lock *lock) } // This is the case when no lock was passed in else - // Lock to be used is our lock - lock_to_be_used = this->locking_strategy_; + { + // Lock to be used is our lock + lock_to_be_used = this->locking_strategy_; + } // If there's a locking strategy then we need to acquire the lock // before decrementing the count. @@ -827,7 +829,9 @@ ACE_Data_Block::release_no_delete (ACE_Lock *lock) result = this->release_i (); } else - result = this->release_i (); + { + result = this->release_i (); + } return result; } -- cgit v1.2.1