summaryrefslogtreecommitdiff
path: root/TAO
diff options
context:
space:
mode:
Diffstat (limited to 'TAO')
-rw-r--r--TAO/ChangeLog9
-rw-r--r--TAO/examples/RTScheduling/Fixed_Priority_Scheduler/Fixed_Priority_Scheduler.mpc3
-rw-r--r--TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.mpc2
-rw-r--r--TAO/tao/ORB.h2
-rw-r--r--TAO/tao/Transport_Timer.h2
5 files changed, 14 insertions, 4 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index d23d6284bcb..1d4d3523448 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,12 @@
+Wed Apr 19 12:51:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.mpc:
+ * examples/RTScheduling/Fixed_Priority_Scheduler/Fixed_Priority_Scheduler.mpc:
+ Made these projects dependent on each other to make sure
+ that they don't build in parallel and generate the same idl
+ file twice at the same moment. Thanks to Chad Elliot for the
+ info how to do this the easiest
+
Wed Apr 19 12:42:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl>
* TAO_IDL/be/be_visitor_interface/tie_sh.cpp:
diff --git a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/Fixed_Priority_Scheduler.mpc b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/Fixed_Priority_Scheduler.mpc
index b1d1bb1b2eb..59aef8feb37 100644
--- a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/Fixed_Priority_Scheduler.mpc
+++ b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/Fixed_Priority_Scheduler.mpc
@@ -2,6 +2,7 @@
// $Id$
project(*Starter): namingexe, rtscheduling_server {
+ after += MIF_Scheduler_Starter
idlflags += -o ..
IDL_Files {
@@ -18,7 +19,7 @@ project(*Starter): namingexe, rtscheduling_server {
}
project(*test) : namingexe, rtscheduling_server {
- after += (*Starter)
+ after += *Starter
idlflags += -o ..
diff --git a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.mpc b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.mpc
index fc78bd61279..1e6daba4900 100644
--- a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.mpc
+++ b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.mpc
@@ -19,7 +19,7 @@ project(*Starter): namingexe, rtscheduling_server {
}
project(*test) : namingexe, rtscheduling_server {
- after += (*Starter)
+ after += *Starter
idlflags += -o ..
IDL_Files {
diff --git a/TAO/tao/ORB.h b/TAO/tao/ORB.h
index 2077bad1c79..f6c0f96d0f5 100644
--- a/TAO/tao/ORB.h
+++ b/TAO/tao/ORB.h
@@ -485,7 +485,7 @@ namespace CORBA
* deactivation or other operations associated with object adapters)
* has completed.
*/
- void shutdown (CORBA::Boolean wait_for_completion = 0
+ void shutdown (CORBA::Boolean wait_for_completion = false
ACE_ENV_ARG_DECL_WITH_DEFAULTS);
/**
diff --git a/TAO/tao/Transport_Timer.h b/TAO/tao/Transport_Timer.h
index 50593fff2e4..ddd3e8d8b4d 100644
--- a/TAO/tao/Transport_Timer.h
+++ b/TAO/tao/Transport_Timer.h
@@ -36,7 +36,7 @@ class TAO_Transport;
* is a TAO_Transport and the client is the Reactor.
*
*/
-class TAO_Export TAO_Transport_Timer : public ACE_Event_Handler
+class TAO_Transport_Timer : public ACE_Event_Handler
{
public:
/// Constructor