diff options
| author | brunsch <brunsch@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-11-05 22:11:54 +0000 |
|---|---|---|
| committer | brunsch <brunsch@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-11-05 22:11:54 +0000 |
| commit | 3e34c0c6ba6a36a3be7ae1ce5d1a16f75e6cb0a1 (patch) | |
| tree | dcb6a0a7f8b722b8d4b01f9d2c86c6cd3dfcb273 | |
| parent | 42d0970e3ff203035cc489cb23b0afd9b50879ab (diff) | |
| download | ATCD-3e34c0c6ba6a36a3be7ae1ce5d1a16f75e6cb0a1.tar.gz | |
ChangeLogTag:Sun Nov 5 14:05:13 2000 Darrell Brunsch <brunsch@uci.edu>
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-02a | 6 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-03a | 6 | ||||
| -rw-r--r-- | ace/SSL/SSL_Context.cpp | 3 | ||||
| -rw-r--r-- | ace/SSL/SSL_SOCK_Stream.i | 6 | ||||
| -rw-r--r-- | ace/Sample_History.cpp | 2 |
6 files changed, 24 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog index 21d52728e85..aafc9d09c28 100644 --- a/ChangeLog +++ b/ChangeLog @@ -88,6 +88,12 @@ Sun Nov 5 14:05:13 2000 Darrell Brunsch <brunsch@uci.edu> Updated to use the new ACE_AS_STATIC_LIBS macro. + * ace/Sample_History.cpp: + * ace/SSL/SSL_Context.cpp: + * ace/SSL/SSL_SOCK_Stream.i: + + Fixed miscellaneous ACE_USES_UNICODE problems with ACE_LIB_TEXT. + Sat Nov 4 19:33:39 2000 Carlos O'Ryan <coryan@uci.edu> * bin/auto_compile: diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a index 21d52728e85..aafc9d09c28 100644 --- a/ChangeLogs/ChangeLog-02a +++ b/ChangeLogs/ChangeLog-02a @@ -88,6 +88,12 @@ Sun Nov 5 14:05:13 2000 Darrell Brunsch <brunsch@uci.edu> Updated to use the new ACE_AS_STATIC_LIBS macro. + * ace/Sample_History.cpp: + * ace/SSL/SSL_Context.cpp: + * ace/SSL/SSL_SOCK_Stream.i: + + Fixed miscellaneous ACE_USES_UNICODE problems with ACE_LIB_TEXT. + Sat Nov 4 19:33:39 2000 Carlos O'Ryan <coryan@uci.edu> * bin/auto_compile: diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index 21d52728e85..aafc9d09c28 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -88,6 +88,12 @@ Sun Nov 5 14:05:13 2000 Darrell Brunsch <brunsch@uci.edu> Updated to use the new ACE_AS_STATIC_LIBS macro. + * ace/Sample_History.cpp: + * ace/SSL/SSL_Context.cpp: + * ace/SSL/SSL_SOCK_Stream.i: + + Fixed miscellaneous ACE_USES_UNICODE problems with ACE_LIB_TEXT. + Sat Nov 4 19:33:39 2000 Carlos O'Ryan <coryan@uci.edu> * bin/auto_compile: diff --git a/ace/SSL/SSL_Context.cpp b/ace/SSL/SSL_Context.cpp index c667e2b60aa..3beee68f6c2 100644 --- a/ace/SSL/SSL_Context.cpp +++ b/ace/SSL/SSL_Context.cpp @@ -114,7 +114,8 @@ ACE_SSL_Context::ssl_library_init (void) USYNC_THREAD, 0) != 0) ACE_ERROR ((LM_ERROR, - "(%P|%t) ACE_SSL_Context::ssl_library_init - %p\n", + ACE_TEXT ("(%P|%t) ACE_SSL_Context::ssl_library_init ") + ACE_TEXT ("- %p\n"), "mutex_init")); } diff --git a/ace/SSL/SSL_SOCK_Stream.i b/ace/SSL/SSL_SOCK_Stream.i index 94926f1f95e..811d9ddc1be 100644 --- a/ace/SSL/SSL_SOCK_Stream.i +++ b/ace/SSL/SSL_SOCK_Stream.i @@ -33,9 +33,9 @@ ACE_SSL_SOCK_Stream::ACE_SSL_SOCK_Stream (ACE_SSL_Context *context) if (this->ssl_ == 0) ACE_ERROR ((LM_ERROR, - "(%P|%t) ACE_SSL_SOCK_Stream - cannot allocate new " - "SSL structure%p\n", - "")); + ACE_TEXT ("(%P|%t) ACE_SSL_SOCK_Stream ") + ACE_TEXT ("- cannot allocate new SSL structure%p\n"), + ACE_TEXT (""))); ::SSL_set_verify (this->ssl_, ctx->default_verify_mode (), diff --git a/ace/Sample_History.cpp b/ace/Sample_History.cpp index 3eaf796f441..df21786cf71 100644 --- a/ace/Sample_History.cpp +++ b/ace/Sample_History.cpp @@ -30,7 +30,7 @@ ACE_Sample_History::dump_samples (const ACE_TCHAR *msg, { ACE_UINT64 x = this->samples_[i] / scale_factor; ACE_UINT32 val = ACE_CU64_TO_CU32 (x); - ACE_DEBUG ((LM_DEBUG, "%s: %d %u\n", msg, i, val)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT("%s: %d %u\n"), msg, i, val)); } } |