From b75a57fdee7b2ccb5ca455f3394434b63811f521 Mon Sep 17 00:00:00 2001 From: bala Date: Fri, 23 Mar 2001 02:22:40 +0000 Subject: ChangeLogTag: Thu Mar 22 20:08:05 2001 Balachandran Natarajan --- TAO/ChangeLogs/ChangeLog-02a | 4 +++- TAO/tests/POA/Makefile | 3 +-- TAO/tests/POA/Makefile.bor | 3 +-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index 6facab7924a..6089988aee1 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,7 +1,9 @@ Thu Mar 22 20:08:05 2001 Balachandran Natarajan * tao/PortableServer/POA.cpp: Backed out changes from "Thu Mar 22 - 15:32:22 2001 Carlos O'Ryan ." + 15:32:22 2001 Carlos O'Ryan ." The fix is + being commited by Irfan as the above changes may not be the + right fix. Thu Mar 22 15:32:22 2001 Carlos O'Ryan diff --git a/TAO/tests/POA/Makefile b/TAO/tests/POA/Makefile index e039e18d70e..4824dec68c5 100644 --- a/TAO/tests/POA/Makefile +++ b/TAO/tests/POA/Makefile @@ -15,8 +15,7 @@ DIRS = Destruction \ Deactivation \ Non_Servant_Upcalls \ Single_Threaded_POA \ - Identity \ - Multiple_Deactivations + Identity # The following test hasn't been updated yet # Demux_Test diff --git a/TAO/tests/POA/Makefile.bor b/TAO/tests/POA/Makefile.bor index 783b939884a..614d66c2ffa 100644 --- a/TAO/tests/POA/Makefile.bor +++ b/TAO/tests/POA/Makefile.bor @@ -8,7 +8,6 @@ DIRS = \ Identity \ Non_Servant_Upcalls \ Single_Threaded_POA \ - wait_for_completion \ - Multiple_Deactivations + wait_for_completion !include <$(ACE_ROOT)\include\makeinclude\recurse.bor> -- cgit v1.2.1