Fri Jan 22 15:44:01 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl>

        * 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

1 files changed, 7 insertions, 3 deletions

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;
 }