summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbala <balanatarajan@users.noreply.github.com>2001-03-23 02:22:40 +0000
committerbala <balanatarajan@users.noreply.github.com>2001-03-23 02:22:40 +0000
commitb75a57fdee7b2ccb5ca455f3394434b63811f521 (patch)
tree3ad64cab1dd63d4c3e9a757708005ad1323f1e09
parent7ba3ce9a2fcc317fe520db33d0fc14f03160f15c (diff)
downloadATCD-b75a57fdee7b2ccb5ca455f3394434b63811f521.tar.gz
ChangeLogTag: Thu Mar 22 20:08:05 2001 Balachandran Natarajan <bala@cs.wustl.edu>
-rw-r--r--TAO/ChangeLogs/ChangeLog-02a4
-rw-r--r--TAO/tests/POA/Makefile3
-rw-r--r--TAO/tests/POA/Makefile.bor3
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 <bala@cs.wustl.edu>
* tao/PortableServer/POA.cpp: Backed out changes from "Thu Mar 22
- 15:32:22 2001 Carlos O'Ryan <coryan@uci.edu>."
+ 15:32:22 2001 Carlos O'Ryan <coryan@uci.edu>." 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 <coryan@uci.edu>
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>