summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlevine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2000-07-11 21:05:34 +0000
committerlevine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2000-07-11 21:05:34 +0000
commit71f7cdec56b545eda1b65b1b4e290e01b68d51e6 (patch)
tree08b73c9cf814506c231c4bf48cbf6abbf304ab0f
parentb3fb32aa5df19b1051ced9aaf10a287e276f071a (diff)
downloadATCD-71f7cdec56b545eda1b65b1b4e290e01b68d51e6.tar.gz
ChangeLogTag: Tue Jul 11 16:03:58 2000 David L. Levine <levine@cs.wustl.edu>
-rw-r--r--ChangeLog8
-rw-r--r--ChangeLogs/ChangeLog-02a8
-rw-r--r--ChangeLogs/ChangeLog-03a8
-rw-r--r--ace/Local_Tokens.cpp4
4 files changed, 26 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index dce129aee27..7b0c153b9a0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Tue Jul 11 16:03:58 2000 David L. Levine <levine@cs.wustl.edu>
+
+ * ace/Local_Tokens.cpp (ACE_TPQ_Entry ctor): don't cast result
+ of ACE_Thread::self (), because it might be a structure.
+ Thanks to Ossama for reminding me of that.
+ Changed format specifier to be %u instead of %lu, to avoid
+ mismatch, at least on some platforms.
+
Tue Jul 11 14:47:48 2000 Chris Kohlhoff <chris@kohlhoff.com>
* ace/config-win32-common.h:
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index dce129aee27..7b0c153b9a0 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,11 @@
+Tue Jul 11 16:03:58 2000 David L. Levine <levine@cs.wustl.edu>
+
+ * ace/Local_Tokens.cpp (ACE_TPQ_Entry ctor): don't cast result
+ of ACE_Thread::self (), because it might be a structure.
+ Thanks to Ossama for reminding me of that.
+ Changed format specifier to be %u instead of %lu, to avoid
+ mismatch, at least on some platforms.
+
Tue Jul 11 14:47:48 2000 Chris Kohlhoff <chris@kohlhoff.com>
* ace/config-win32-common.h:
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index dce129aee27..7b0c153b9a0 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,11 @@
+Tue Jul 11 16:03:58 2000 David L. Levine <levine@cs.wustl.edu>
+
+ * ace/Local_Tokens.cpp (ACE_TPQ_Entry ctor): don't cast result
+ of ACE_Thread::self (), because it might be a structure.
+ Thanks to Ossama for reminding me of that.
+ Changed format specifier to be %u instead of %lu, to avoid
+ mismatch, at least on some platforms.
+
Tue Jul 11 14:47:48 2000 Chris Kohlhoff <chris@kohlhoff.com>
* ace/config-win32-common.h:
diff --git a/ace/Local_Tokens.cpp b/ace/Local_Tokens.cpp
index 6053d1984d9..af564c8438a 100644
--- a/ace/Local_Tokens.cpp
+++ b/ace/Local_Tokens.cpp
@@ -91,10 +91,10 @@ ACE_TPQ_Entry::ACE_TPQ_Entry (const ACE_Token_Proxy *new_proxy,
ACE_OS::hostname (host_name, sizeof host_name);
ACE_OS::sprintf (name,
- ACE_TEXT ("/%s/%u/%lu"),
+ ACE_TEXT ("/%s/%u/%u"),
host_name,
ACE_static_cast (u_int, ACE_OS::getpid ()),
- ACE_static_cast (u_long, ACE_Thread::self ()));
+ ACE_Thread::self ());
this->client_id (name);
}