summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorschmidt <douglascraigschmidt@users.noreply.github.com>2001-02-20 12:40:17 +0000
committerschmidt <douglascraigschmidt@users.noreply.github.com>2001-02-20 12:40:17 +0000
commitf7b6f3b54f2cfa5047c46a3c74a5e66b0c244f5e (patch)
tree8cc17b028d7760958acd7228e21b4e853acebcd3
parent755f028ac0323aef05596660dd8093a0300efb85 (diff)
downloadATCD-f7b6f3b54f2cfa5047c46a3c74a5e66b0c244f5e.tar.gz
ChangeLogTag:Tue Feb 20 06:34:26 2001 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu>
-rw-r--r--ChangeLog5
-rw-r--r--ChangeLogs/ChangeLog-02a5
-rw-r--r--ChangeLogs/ChangeLog-03a5
-rw-r--r--TAO/ChangeLogs/ChangeLog-02a9
-rw-r--r--TAO/tao/Makefile.bor1
-rw-r--r--THANKS1
-rw-r--r--ace/Thread_Manager.cpp2
7 files changed, 26 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 24fd32efbba..ab0fe52777d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Feb 20 06:34:26 2001 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu>
+
+ * ace/Thread_Manager.cpp (cancel_grp): Fixed a typo in
+ the ACE_TRACE macro. Thanks to Mike Curtis for reporting this.
+
Mon Feb 19 16:38:08 2001 Krishnakumar B <kitty@cs.wustl.edu>
* ace/Asynch_Acceptor.{h,cpp}:
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index 24fd32efbba..ab0fe52777d 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,8 @@
+Tue Feb 20 06:34:26 2001 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu>
+
+ * ace/Thread_Manager.cpp (cancel_grp): Fixed a typo in
+ the ACE_TRACE macro. Thanks to Mike Curtis for reporting this.
+
Mon Feb 19 16:38:08 2001 Krishnakumar B <kitty@cs.wustl.edu>
* ace/Asynch_Acceptor.{h,cpp}:
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index 24fd32efbba..ab0fe52777d 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,8 @@
+Tue Feb 20 06:34:26 2001 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu>
+
+ * ace/Thread_Manager.cpp (cancel_grp): Fixed a typo in
+ the ACE_TRACE macro. Thanks to Mike Curtis for reporting this.
+
Mon Feb 19 16:38:08 2001 Krishnakumar B <kitty@cs.wustl.edu>
* ace/Asynch_Acceptor.{h,cpp}:
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index ecd75081f85..f61bfdbe5dd 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,12 @@
+Tue Feb 20 06:27:17 2001 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu>
+
+ * tao/Makefile.bor (OBJFILES): Remove
+
+ $(OBJDIR)\GIOP_Message_Headers.obj
+
+ since this file no longer exists. Thanks to Johnny Willemsen
+ for reporting this.
+
Mon Feb 19 20:19:07 2001 Balachandran Natarajan <bala@cs.wustl.edu>
* tao/GIOP_Message_Lite.cpp:
diff --git a/TAO/tao/Makefile.bor b/TAO/tao/Makefile.bor
index c7569660f45..467fd2c51d9 100644
--- a/TAO/tao/Makefile.bor
+++ b/TAO/tao/Makefile.bor
@@ -73,7 +73,6 @@ OBJFILES = \
$(OBJDIR)\GIOP_Message_Generator_Parser_12.obj \
$(OBJDIR)\GIOP_Message_Generator_Parser_Impl.obj \
$(OBJDIR)\GIOP_Message_Handler.obj \
- $(OBJDIR)\GIOP_Message_Headers.obj \
$(OBJDIR)\GIOP_Message_Lite.obj \
$(OBJDIR)\GIOP_Message_Locate_Header.obj \
$(OBJDIR)\GIOP_Message_State.obj \
diff --git a/THANKS b/THANKS
index 79fb21d4887..fc19cf0a921 100644
--- a/THANKS
+++ b/THANKS
@@ -1149,6 +1149,7 @@ Orlando Ribeiro <oribeiro@inescporto.pt>
Doug Warner <dougwarner@micron.com>
Kevin Regan <kregan@infoglide.com>
Andy Olson <andrew.olson@lmco.com>
+Max Voronoy <m.voronoy@telesens.com.ua>
I would particularly like to thank Paul Stephenson, who worked with me
at Ericsson in the early 1990's. Paul devised the recursive Makefile
diff --git a/ace/Thread_Manager.cpp b/ace/Thread_Manager.cpp
index 0dacdf7bc55..433e2080f41 100644
--- a/ace/Thread_Manager.cpp
+++ b/ace/Thread_Manager.cpp
@@ -1307,7 +1307,7 @@ ACE_Thread_Manager::kill_grp (int grp_id, int signum)
int
ACE_Thread_Manager::cancel_grp (int grp_id, int async_cancel)
{
- ACE_TRACE ("ACE_Thread_Manager::resume_grp");
+ ACE_TRACE ("ACE_Thread_Manager::cancel_grp");
return this->apply_grp (grp_id,
ACE_THR_MEMBER_FUNC (&ACE_Thread_Manager::cancel_thr),
async_cancel);