diff options
| author | schmidt <douglascraigschmidt@users.noreply.github.com> | 2013-05-08 19:04:52 +0000 |
|---|---|---|
| committer | schmidt <douglascraigschmidt@users.noreply.github.com> | 2013-05-08 19:04:52 +0000 |
| commit | d31ef53df49cc29dacd590000dba729e8b6724a5 (patch) | |
| tree | 8af7685e63488dd866f3f5fa7fc947b27821055f | |
| parent | 0106fd200b668474a549ddbb27079f467a6c45b2 (diff) | |
| download | ATCD-d31ef53df49cc29dacd590000dba729e8b6724a5.tar.gz | |
ChangeLogTag:Wed
| -rw-r--r-- | ACE/ChangeLog | 5 | ||||
| -rw-r--r-- | ACE/ace/OS_NS_Thread.inl | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index a2a278bf8b6..e59853a93da 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,8 @@ +Wed May 8 19:04:22 UTC 2013 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> + + * ace/OS_NS_Thread.inl (ACE_OS::thr_id): Fixed a warning on + Windows. Thanks to Johnny for reporting this. + Wed May 8 13:52:54 UTC 2013 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> * ace/OS_NS_Thread.inl (ACE_OS::thr_id): Replaced the call to diff --git a/ACE/ace/OS_NS_Thread.inl b/ACE/ace/OS_NS_Thread.inl index a65d3a83803..f7593d93be7 100644 --- a/ACE/ace/OS_NS_Thread.inl +++ b/ACE/ace/OS_NS_Thread.inl @@ -3086,12 +3086,12 @@ ACE_OS::thr_id (char buffer[], size_t buffer_length) #if defined (ACE_HAS_SNPRINTF) return ACE_OS::snprintf (buffer, buffer_length, - "u", + "%u", static_cast <unsigned> (ACE_OS::thr_self ())); #else ACE_UNUSED_ARG (buffer_length); return ACE_OS::sprintf (buffer, - "u", + "%u", static_cast <unsigned> (ACE_OS::thr_self ())); #endif /* ACE_HAS_SNPRINTF */ #else |