diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2009-01-22 15:45:13 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2009-01-22 15:45:13 +0000 |
| commit | 6a25de949d23ff142e9fdee5b1363665169ce6e0 (patch) | |
| tree | ae1cc83ebfb4cc477db35bd80c7d0f3424f69d9e /ACE/ace/Select_Reactor_T.cpp | |
| parent | 1c8c657206c17a049089ec0c4f895e5e2fad9318 (diff) | |
| download | ATCD-6a25de949d23ff142e9fdee5b1363665169ce6e0.tar.gz | |
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
Diffstat (limited to 'ACE/ace/Select_Reactor_T.cpp')
| -rw-r--r-- | ACE/ace/Select_Reactor_T.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/ACE/ace/Select_Reactor_T.cpp b/ACE/ace/Select_Reactor_T.cpp index 1eb5a17d79d..57f5f9f36bf 100644 --- a/ACE/ace/Select_Reactor_T.cpp +++ b/ACE/ace/Select_Reactor_T.cpp @@ -1493,13 +1493,12 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::check_handles (void) // variant since fstat always returns an error on socket FDs. rd_mask.set_bit (h); - int select_width; # if defined (ACE_WIN32) // This arg is ignored on Windows and causes pointer truncation // warnings on 64-bit compiles. - select_width = 0; + int select_width = 0; # else - select_width = int (h) + 1; + int select_width = int (h) + 1; # endif /* ACE_WIN32 */ if (ACE_OS::select (select_width, |