diff options
| author | schmidt <douglascraigschmidt@users.noreply.github.com> | 2013-05-08 13:53:29 +0000 |
|---|---|---|
| committer | schmidt <douglascraigschmidt@users.noreply.github.com> | 2013-05-08 13:53:29 +0000 |
| commit | 08c5b0c01b6854ab31d47e52fda9d4935aee9288 (patch) | |
| tree | 6ae161592c17efa94ab3f3677bf4718303f8397d /ACE | |
| parent | b88fbe776aea270afdc5fd41d7abf8e028670c57 (diff) | |
| download | ATCD-08c5b0c01b6854ab31d47e52fda9d4935aee9288.tar.gz | |
ChangeLogTag:Wed
Diffstat (limited to 'ACE')
| -rw-r--r-- | ACE/ChangeLog | 6 | ||||
| -rw-r--r-- | ACE/ace/OS_NS_Thread.cpp | 11 | ||||
| -rw-r--r-- | ACE/ace/OS_NS_Thread.inl | 4 | ||||
| -rw-r--r-- | ACE/tests/Collection_Test.cpp | 3 | ||||
| -rw-r--r-- | ACE/tests/Unbounded_Set_Test.cpp | 1 |
5 files changed, 13 insertions, 12 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 3414f95f05a..a2a278bf8b6 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,9 @@ +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 + ACE_Thread::self() with ACE_OS::thr_self(). Thanks to Johnny + Willemsen for reporting this. + Tue May 7 15:04:24 UTC 2013 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> * ace/OS_NS_Thread.{h,inl}: Added a new ACE_OS::thr_id() method diff --git a/ACE/ace/OS_NS_Thread.cpp b/ACE/ace/OS_NS_Thread.cpp index eac4e1627fa..6a3d6232358 100644 --- a/ACE/ace/OS_NS_Thread.cpp +++ b/ACE/ace/OS_NS_Thread.cpp @@ -54,12 +54,11 @@ ACE_Thread_ID::to_string (char *thr_string) const ACE_OS::sprintf (thr_string, "%u", static_cast <unsigned> (this->thread_id_)); #else - // Yes, this is an ugly C-style cast, but the - // correct C++ cast is different depending on - // whether the t_id is an integral type or a pointer - // type. FreeBSD uses a pointer type, but doesn't - // have a _np function to get an integral type like - // other OSes, so use the bigger hammer. + // Yes, this is an ugly C-style cast, but the correct C++ cast is + // different depending on whether the t_id is an integral type or a + // pointer type. FreeBSD uses a pointer type, but doesn't have a _np + // function to get an integral type like other OSes, so use the + // bigger hammer. ACE_OS::sprintf (thr_string, "%lu", (unsigned long) thread_handle_); #endif /* ACE_WIN32 */ diff --git a/ACE/ace/OS_NS_Thread.inl b/ACE/ace/OS_NS_Thread.inl index 5ee6b331b15..a65d3a83803 100644 --- a/ACE/ace/OS_NS_Thread.inl +++ b/ACE/ace/OS_NS_Thread.inl @@ -3087,12 +3087,12 @@ ACE_OS::thr_id (char buffer[], size_t buffer_length) return ACE_OS::snprintf (buffer, buffer_length, "u", - static_cast <unsigned> (ACE_Thread::self ())); + static_cast <unsigned> (ACE_OS::thr_self ())); #else ACE_UNUSED_ARG (buffer_length); return ACE_OS::sprintf (buffer, "u", - static_cast <unsigned> (ACE_Thread::self ())); + static_cast <unsigned> (ACE_OS::thr_self ())); #endif /* ACE_HAS_SNPRINTF */ #else ACE_hthread_t t_id; diff --git a/ACE/tests/Collection_Test.cpp b/ACE/tests/Collection_Test.cpp index 253ec6a07fb..abc97634323 100644 --- a/ACE/tests/Collection_Test.cpp +++ b/ACE/tests/Collection_Test.cpp @@ -13,11 +13,8 @@ */ //============================================================================= - #include "test_config.h" - - #include "ace/Containers.h" #include "Collection_Test.h" diff --git a/ACE/tests/Unbounded_Set_Test.cpp b/ACE/tests/Unbounded_Set_Test.cpp index 960a4dd0ef5..8eb4340e316 100644 --- a/ACE/tests/Unbounded_Set_Test.cpp +++ b/ACE/tests/Unbounded_Set_Test.cpp @@ -8,7 +8,6 @@ * This test illustrates the use of ACE_Unbounded_Set. * No command line arguments are needed to run the test. * - * * @author Rudolf Weber <rfweber@tesionmail.de> * @author ace/tests integration <Oliver.Kellogg@sysde.eads.net> */ |