diff options
| author | levine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-07-11 22:31:48 +0000 |
|---|---|---|
| committer | levine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-07-11 22:31:48 +0000 |
| commit | 820e43d980a99b982c41214d50b93e38766ee8da (patch) | |
| tree | 77a89307b66f9a584c842345bfdc24190120fac8 | |
| parent | e5319bd38b8fc805d9adbe67f6f53999379a132e (diff) | |
| download | ATCD-820e43d980a99b982c41214d50b93e38766ee8da.tar.gz | |
ChangeLogTag: Tue Jul 11 17:20:48 2000 David L. Levine <levine@cs.wustl.edu>
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-02a | 5 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-03a | 5 | ||||
| -rw-r--r-- | ace/Local_Tokens.cpp | 8 |
4 files changed, 21 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index 2d8a44cfe5d..a1ff648d103 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Tue Jul 11 17:20:48 2000 David L. Levine <levine@cs.wustl.edu> + + * ace/Local_Tokens.cpp (ACE_TPQ_Entry ctor): try a reinterpret cast + of ACE_Thread::self () to u_long. We need u_long on Linux. + Tue Jul 11 16:09:14 2000 David L. Levine <levine@cs.wustl.edu> * bin/auto_run_tests.lst: don't run LongUpcalls test diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a index 2d8a44cfe5d..a1ff648d103 100644 --- a/ChangeLogs/ChangeLog-02a +++ b/ChangeLogs/ChangeLog-02a @@ -1,3 +1,8 @@ +Tue Jul 11 17:20:48 2000 David L. Levine <levine@cs.wustl.edu> + + * ace/Local_Tokens.cpp (ACE_TPQ_Entry ctor): try a reinterpret cast + of ACE_Thread::self () to u_long. We need u_long on Linux. + Tue Jul 11 16:09:14 2000 David L. Levine <levine@cs.wustl.edu> * bin/auto_run_tests.lst: don't run LongUpcalls test diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index 2d8a44cfe5d..a1ff648d103 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,8 @@ +Tue Jul 11 17:20:48 2000 David L. Levine <levine@cs.wustl.edu> + + * ace/Local_Tokens.cpp (ACE_TPQ_Entry ctor): try a reinterpret cast + of ACE_Thread::self () to u_long. We need u_long on Linux. + Tue Jul 11 16:09:14 2000 David L. Levine <levine@cs.wustl.edu> * bin/auto_run_tests.lst: don't run LongUpcalls test diff --git a/ace/Local_Tokens.cpp b/ace/Local_Tokens.cpp index af564c8438a..f2ff85a829f 100644 --- a/ace/Local_Tokens.cpp +++ b/ace/Local_Tokens.cpp @@ -90,11 +90,15 @@ ACE_TPQ_Entry::ACE_TPQ_Entry (const ACE_Token_Proxy *new_proxy, ACE_TCHAR name[(sizeof host_name / sizeof (ACE_TCHAR)) + 256]; ACE_OS::hostname (host_name, sizeof host_name); + ACE_thread_t thread_id = ACE_Thread::self (); + + // The cast is an attempt to get this to compile (and run, + // hopefully) regardless of the type of ACE_thread_t. ACE_OS::sprintf (name, - ACE_TEXT ("/%s/%u/%u"), + ACE_TEXT ("/%s/%u/%lu"), host_name, ACE_static_cast (u_int, ACE_OS::getpid ()), - ACE_Thread::self ()); + *ACE_reinterpret_cast (u_long *, &thread_id)); this->client_id (name); } |