diff options
| author | Abdullah Sowayan <sowayan@users.noreply.github.com> | 2007-05-28 19:43:27 +0000 |
|---|---|---|
| committer | Abdullah Sowayan <sowayan@users.noreply.github.com> | 2007-05-28 19:43:27 +0000 |
| commit | 46afaee3e1154f3ea594137654188db3adf20556 (patch) | |
| tree | 9eb2d67b2b50258f86374581aa842c47a67b3e64 | |
| parent | 07115c071236bb5ac5dcf0e1c55933152ef8e915 (diff) | |
| download | ATCD-46afaee3e1154f3ea594137654188db3adf20556.tar.gz | |
Mon May 28 19:42:14 UTC 2007 Abdullah Sowayan <abdullah.sowayan@lmco.com>
| -rw-r--r-- | ACE/ChangeLog | 15 | ||||
| -rw-r--r-- | ACE/netsvcs/lib/Server_Logging_Handler_T.cpp | 17 | ||||
| -rw-r--r-- | ACE/tests/Upgradable_RW_Test.cpp | 2 |
3 files changed, 22 insertions, 12 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 2f3e48cd59d..c45b882382e 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,7 +1,18 @@ +Mon May 28 19:42:14 UTC 2007 Abdullah Sowayan <abdullah.sowayan@lmco.com> + + * netsvcs/lib/Server_Logging_Handler_T.cpp: + + Replaced tabs with spaces. + + * tests/Upgradable_RW_Test.cpp: + + Addressed the "assignment within conditional expression" warning + on the WinXP_VC71_WarningLevel4 build. + Mon May 28 19:35:55 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl> - * ace/OS_NS_unistd.cpp: - Const and layout change + * ace/OS_NS_unistd.cpp: + Const and layout change * ace/OS_NS_unistd.h: Layout change diff --git a/ACE/netsvcs/lib/Server_Logging_Handler_T.cpp b/ACE/netsvcs/lib/Server_Logging_Handler_T.cpp index 04c1e21d158..d17a7ca8764 100644 --- a/ACE/netsvcs/lib/Server_Logging_Handler_T.cpp +++ b/ACE/netsvcs/lib/Server_Logging_Handler_T.cpp @@ -79,8 +79,8 @@ ACE_Server_Logging_Handler_T<ACE_PEER_STREAM_2, COUNTER, ACE_SYNCH_USE, LMR>::ha ACE_CDR::ULong length; ssize_t count = ACE::recv_n (this->peer ().get_handle (), - header->wr_ptr (), - 8); + header->wr_ptr (), + 8); switch (count) { // Handle shutdown and error cases. @@ -143,14 +143,13 @@ ACE_Server_Logging_Handler_T<ACE_PEER_STREAM_2, COUNTER, ACE_SYNCH_USE, LMR>::ha log_record.length (length); // Send the log record to the log message receiver for processing. - if (ACE_BIT_ENABLED (ACE_Log_Msg::instance ()->flags (), - ACE_Log_Msg::STDERR)) - receiver ().log_record (this->host_name (), - log_record); + if (ACE_BIT_ENABLED (ACE_Log_Msg::instance ()->flags (), ACE_Log_Msg::STDERR)) + receiver ().log_record (this->host_name (), log_record); + ostream *orig_ostream = ACE_Log_Msg::instance ()->msg_ostream (); receiver ().log_output (this->host_name (), - log_record, - orig_ostream); + log_record, + orig_ostream); return 0; #if 0 @@ -236,7 +235,7 @@ ACE_Server_Logging_Handler_T<ACE_PEER_STREAM_2, COUNTER, ACE_SYNCH_USE, LMR>::ha #endif ACE_NOTREACHED (return -1;) - } +} // Hook called by Server_Logging_Acceptor when connection is // established. diff --git a/ACE/tests/Upgradable_RW_Test.cpp b/ACE/tests/Upgradable_RW_Test.cpp index ca99f677496..6a717279e1f 100644 --- a/ACE/tests/Upgradable_RW_Test.cpp +++ b/ACE/tests/Upgradable_RW_Test.cpp @@ -455,7 +455,7 @@ run_main (int argc, ACE_TCHAR *argv[]) i < n_entries; i++) { - if ((element_ptr = linked_list_ptr->delete_head ())) + if (0 != (element_ptr = linked_list_ptr->delete_head ())) { cString_ptr = element_ptr->value (); delete cString_ptr; |