summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOssama Othman <ossama-othman@users.noreply.github.com>2005-12-12 23:21:46 +0000
committerOssama Othman <ossama-othman@users.noreply.github.com>2005-12-12 23:21:46 +0000
commitf3bde7e49d7f7f9fbfc0716feee53541856da149 (patch)
tree89f44a6802291ae555c5939a1fe90934bcd2cc5f
parentd86db76c12960dfa6621977cc857d2b02dfe43d3 (diff)
downloadATCD-f3bde7e49d7f7f9fbfc0716feee53541856da149.tar.gz
ChangeLogTag:Mon Dec 12 15:20:10 2005 <ossama@dre.vanderbilt.edu>
-rw-r--r--TAO/ChangeLog13
-rw-r--r--TAO/examples/Load_Balancing/Load_Balancing.mpc2
-rw-r--r--TAO/orbsvcs/Notify_Service/Notify_Service.mpc1
3 files changed, 15 insertions, 1 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 80dce580364..a1ec0d91c3a 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,16 @@
+Mon Dec 12 15:20:10 2005 <ossama@dre.vanderbilt.edu>
+
+ * orbsvcs/Notify_Service/Notify_Service.mpc:
+
+ Disable NT_Notify_Service project in ace_for_tao configuration.
+ It depends on ace/NT_Service.*, which is currently not part of
+ the ace_for_tao subset.
+
+ * examples/Load_Balancing/Load_Balancing.mpc:
+
+ Disable in ace_for_tao configuration. It requires ACE_DLList,
+ which is not part of the ace_for_tao subset.
+
Mon Dec 12 09:35:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>
* tao/ORB_Core.cpp:
diff --git a/TAO/examples/Load_Balancing/Load_Balancing.mpc b/TAO/examples/Load_Balancing/Load_Balancing.mpc
index 61179b0bfe9..95ec38c4fcb 100644
--- a/TAO/examples/Load_Balancing/Load_Balancing.mpc
+++ b/TAO/examples/Load_Balancing/Load_Balancing.mpc
@@ -36,7 +36,7 @@ project(*Client): taoclient, utils, portableserver {
project(*Balancer): taoserver, utils {
exename = load_balancer
- avoids += repo
+ avoids += repo ace_for_tao
IDL_Files {
Load_Balancer.idl
diff --git a/TAO/orbsvcs/Notify_Service/Notify_Service.mpc b/TAO/orbsvcs/Notify_Service/Notify_Service.mpc
index 5b13cba568e..251a4660756 100644
--- a/TAO/orbsvcs/Notify_Service/Notify_Service.mpc
+++ b/TAO/orbsvcs/Notify_Service/Notify_Service.mpc
@@ -13,6 +13,7 @@ project : valuetype, orbsvcsexe, core, notification_serv, naming, iortable {
}
project(NT_Notify_Service) : valuetype, orbsvcsexe, core, notification_serv, naming, iortable {
+ avoids += ace_for_tao
exename = NT_Notify_Service
Source_Files {
Notify_Service.cpp