diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-08-01 07:29:51 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-08-01 07:29:51 +0000 |
| commit | b1e743acbe283a6d7acfc422601de6fdb8175bae (patch) | |
| tree | a1c340cd127d5ef6638e096bb8c3c768bd43a68b | |
| parent | 327b833666f3d13196a30c9b66d2e0cd1290d01f (diff) | |
| download | ATCD-b1e743acbe283a6d7acfc422601de6fdb8175bae.tar.gz | |
Wed Aug 1 07:29:12 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | ACE/ChangeLog | 6 | ||||
| -rw-r--r-- | ACE/netsvcs/lib/Time_Request_Reply.cpp | 16 | ||||
| -rw-r--r-- | ACE/protocols/tests/HTBP/Reactor_Tests/test_config.h | 3 |
3 files changed, 14 insertions, 11 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index c8e5ace198a..7cea15c5729 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,9 @@ +Wed Aug 1 07:29:12 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl> + + * netsvcs/lib/Time_Request_Reply.cpp: + * protocols/tests/HTBP/Reactor_Tests/test_config.h + Replaced ACE_LIB_TEXT with ACE_TEXT + Wed Aug 1 07:27:12 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl> * ace/Service_Config.h: diff --git a/ACE/netsvcs/lib/Time_Request_Reply.cpp b/ACE/netsvcs/lib/Time_Request_Reply.cpp index aede65c2c25..eb062308bb5 100644 --- a/ACE/netsvcs/lib/Time_Request_Reply.cpp +++ b/ACE/netsvcs/lib/Time_Request_Reply.cpp @@ -176,32 +176,32 @@ ACE_Time_Request::dump (void) const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Time_Request::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("*******\nlength = %d\n"), + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("*******\nlength = %d\n"), this->size ())); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("message-type = "))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("message-type = "))); switch (this->msg_type ()) { case ACE_Time_Request::TIME_UPDATE: - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("TIME_UPDATE\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("TIME_UPDATE\n"))); break; default: - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("<unknown type> = %d\n"), this->msg_type ())); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("<unknown type> = %d\n"), this->msg_type ())); break; } if (this->block_forever ()) - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("blocking forever\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("blocking forever\n"))); else { #if !defined (ACE_NLOGGING) ACE_Time_Value tv = this->timeout (); #endif /* ! ACE_NLOGGING */ - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("waiting for %d secs and %d usecs\n"), + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("waiting for %d secs and %d usecs\n"), (int)(tv.sec ()), tv.usec ())); } - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("*******\ntime = %d\n"), + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("*******\ntime = %d\n"), (int)(this->time ()))); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("+++++++\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("+++++++\n"))); #endif /* ACE_HAS_DUMP */ } diff --git a/ACE/protocols/tests/HTBP/Reactor_Tests/test_config.h b/ACE/protocols/tests/HTBP/Reactor_Tests/test_config.h index efd4eb7bcc6..02b32956691 100644 --- a/ACE/protocols/tests/HTBP/Reactor_Tests/test_config.h +++ b/ACE/protocols/tests/HTBP/Reactor_Tests/test_config.h @@ -42,9 +42,6 @@ // The second #undef protects against being reset in a config.h file. #undef ACE_NDEBUG -#undef ACE_TEXT -#define ACE_TEXT ACE_LIB_TEXT - #if defined (ACE_HAS_WINCE) // Note that Pocket PC 2002 will NOT create a directory if it does not start with a leading '\'. // PPC 2002 only accepts '\log' as a valid directory name, while 'log\' works under WinCE 3.0. |