summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbala <balanatarajan@users.noreply.github.com>2004-11-14 22:01:02 +0000
committerbala <balanatarajan@users.noreply.github.com>2004-11-14 22:01:02 +0000
commit9c4e527f9124ea25f49f731cb1cc8f96605afca9 (patch)
treec6236845ffe5dfb61e2241bc6c4543713c724dc3
parent6c3a887df9c2d788224ae50e7f0b48906cf5d6df (diff)
downloadATCD-9c4e527f9124ea25f49f731cb1cc8f96605afca9.tar.gz
ChangeLogTag:Sun Nov 14 21:57:38 2004 Balachandran Natarajan <bala@dre.vanderbilt.edu>
-rw-r--r--TAO/ChangeLog10
-rw-r--r--TAO/tests/Bug_1535_Regression/Bug_1535_Regression.mpc1
2 files changed, 11 insertions, 0 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index bbc77045fea..112f8605f29 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,13 @@
+Sun Nov 14 21:57:38 2004 Balachandran Natarajan <bala@dre.vanderbilt.edu>
+
+ * tests/Bug_1535_Regression/Bug_1535_Regression.mpc:
+
+ Do not build the test when minimum_corba is enabled.
+
+Sun Nov 14 21:38:21 2004 Balachandran Natarajan <bala@dre.vanderbilt.edu>
+
+ * tao/PortableServer/Object_Adapter.cpp:
+
Sun Nov 14 09:50:37 2004 J.T. Conklin <jtc@acorntoolworks.com>
* configure.ac:
diff --git a/TAO/tests/Bug_1535_Regression/Bug_1535_Regression.mpc b/TAO/tests/Bug_1535_Regression/Bug_1535_Regression.mpc
index afe193898ee..b98c35731d5 100644
--- a/TAO/tests/Bug_1535_Regression/Bug_1535_Regression.mpc
+++ b/TAO/tests/Bug_1535_Regression/Bug_1535_Regression.mpc
@@ -2,6 +2,7 @@
// $Id$
project(bug_1535_regression) : taoexe, utils, portableserver {
+ avoids += minimum_corba
Source_Files {
bug_1535_regression.cpp
}