summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOssama Othman <ossama-othman@users.noreply.github.com>2003-03-14 00:14:23 +0000
committerOssama Othman <ossama-othman@users.noreply.github.com>2003-03-14 00:14:23 +0000
commita258f41268b6d181206a5f54ef1216fb7118efa6 (patch)
treef73781f49b45b37219418dbea9fb2fdb1e5df530
parentbabecb5a7d2e9faeab40eed4df32a94b83983120 (diff)
downloadATCD-a258f41268b6d181206a5f54ef1216fb7118efa6.tar.gz
ChangeLogTag:Thu Mar 13 16:11:48 2003 Ossama Othman <ossama@uci.edu>
-rw-r--r--ChangeLog8
-rw-r--r--ace/Log_Msg.cpp8
2 files changed, 14 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index b1db491242c..86b6ca92ced 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Thu Mar 13 16:11:48 2003 Ossama Othman <ossama@uci.edu>
+
+ * ace/Log_Msg.cpp (log_hexdump):
+
+ Use the ACE_SIZE_T_FORMAT_SPECIFIER macro to specify the correct
+ size_t format specifier. Fixes a warning exhibited on 32-bit
+ and 64-bit g++ builds.
+
Thu Mar 13 17:35:48 2003 Steve Huston <shuston@riverace.com>
* examples/C++NPv1/Logging_Handler.cpp (recv_log_record):
diff --git a/ace/Log_Msg.cpp b/ace/Log_Msg.cpp
index 9e281943124..6dfa0edaca5 100644
--- a/ace/Log_Msg.cpp
+++ b/ace/Log_Msg.cpp
@@ -2073,12 +2073,16 @@ ACE_Log_Msg::log_hexdump (ACE_Log_Priority log_priority,
text);
sz += ACE_OS::sprintf (msg_buf + sz,
- ACE_LIB_TEXT ("HEXDUMP %lu bytes"),
+ ACE_LIB_TEXT ("HEXDUMP ")
+ ACE_SIZE_T_FORMAT_SPECIFIER
+ ACE_LIB_TEXT (" bytes"),
size);
if (len < size)
ACE_OS::sprintf (msg_buf + sz,
- ACE_LIB_TEXT (" (showing first %lu bytes)"),
+ ACE_LIB_TEXT (" (showing first ")
+ ACE_SIZE_T_FORMAT_SPECIFIER
+ ACE_LIB_TEXT (" bytes)"),
len);
// Now print out the formatted buffer.