summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlevine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1999-08-11 16:18:19 +0000
committerlevine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1999-08-11 16:18:19 +0000
commitb26e02b6968bee2555c950fc41a01f78cdf1d181 (patch)
treeb52726e606c2d0168f64be32cfb64944903b5aa3
parentc6258e115372fb337bcaf6ed88240a32fd25beda (diff)
downloadATCD-b26e02b6968bee2555c950fc41a01f78cdf1d181.tar.gz
ChangeLogTag: Wed Aug 11 11:18:01 1999 David L. Levine <levine@cs.wustl.edu>
-rw-r--r--TAO/ChangeLog-99c19
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp4
2 files changed, 14 insertions, 9 deletions
diff --git a/TAO/ChangeLog-99c b/TAO/ChangeLog-99c
index 7255d291437..94670b23d4c 100644
--- a/TAO/ChangeLog-99c
+++ b/TAO/ChangeLog-99c
@@ -1,13 +1,18 @@
+Wed Aug 11 11:18:01 1999 David L. Levine <levine@cs.wustl.edu>
+
+ * orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp (recursive_build,
+ recursive_name): Removed trailing "l" from timeout name.
+
Wed Aug 11 11:00:37 1999 Carlos O'Ryan <coryan@cs.wustl.edu>
- * tests/Faults/pong.cpp:
- Left hooks to print the exceptions when received. This is useful
- when debugging the program.
+ * tests/Faults/pong.cpp:
+ Left hooks to print the exceptions when received. This is useful
+ when debugging the program.
- * tests/Faults/Faults.dsw:
- * tests/Faults/pong.dsp:
- * tests/Faults/ping.dsp:
- Added new project files
+ * tests/Faults/Faults.dsw:
+ * tests/Faults/pong.dsp:
+ * tests/Faults/ping.dsp:
+ Added new project files
Wed Aug 11 11:03:29 1999 David L. Levine <levine@cs.wustl.edu>
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp
index db64bc0041d..5e6d1658ef0 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp
@@ -150,7 +150,7 @@ TAO_EC_Sched_Filter_Builder::recursive_build (
// @@ We need a unique name for each timeout, assigned by the
// application?
char buf[64];
- ACE_OS::sprintf (buf, "TIMEOUT:%ul",
+ ACE_OS::sprintf (buf, "TIMEOUT:%u",
ACE_static_cast (u_int,
(e.header.creation_time / 10000)));
ACE_CString name = buf;
@@ -290,7 +290,7 @@ TAO_EC_Sched_Filter_Builder:: recursive_name (
pos++;
char buf[64];
- ACE_OS::sprintf (buf, "TIMEOUT:%ul",
+ ACE_OS::sprintf (buf, "TIMEOUT:%u",
ACE_static_cast (u_int,
(e.header.creation_time / 10000)));
name = buf;