diff options
| -rw-r--r-- | TAO/ChangeLog | 7 | ||||
| -rw-r--r-- | TAO/examples/Load_Balancing/Load_Balancing.mpc | 5 | ||||
| -rw-r--r-- | TAO/examples/OBV/Typed_Events/Typed_Events.mpc | 6 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/Bug_2287_Regression/Bug_2287_Regression.mpc | 3 |
4 files changed, 16 insertions, 5 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 0ff6ea7f462..8bc264e66da 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,10 @@ +Tue Dec 6 08:26:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl> + + * orbsvcs/orbsvcs/Trader/Trader.h: + Also with BDS2006 we need to export the TAO_Lockable class as + workaround. Reported this to Borland, hopefully they will fix + this soon + Mon Dec 5 19:43:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl> * orbsvcs/tests/Bug_2137_Regression/client.cpp: diff --git a/TAO/examples/Load_Balancing/Load_Balancing.mpc b/TAO/examples/Load_Balancing/Load_Balancing.mpc index 736a82ad8ed..61179b0bfe9 100644 --- a/TAO/examples/Load_Balancing/Load_Balancing.mpc +++ b/TAO/examples/Load_Balancing/Load_Balancing.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(*server): taoserver, utils { +project(*Server): taoserver, utils { avoids += repo IDL_Files { @@ -20,6 +20,7 @@ project(*server): taoserver, utils { project(*Client): taoclient, utils, portableserver { avoids += repo + after += *Server IDL_Files { Identity.idl @@ -33,7 +34,7 @@ project(*Client): taoclient, utils, portableserver { } } -project(*Balancer): taoexe, utils, portableserver { +project(*Balancer): taoserver, utils { exename = load_balancer avoids += repo diff --git a/TAO/examples/OBV/Typed_Events/Typed_Events.mpc b/TAO/examples/OBV/Typed_Events/Typed_Events.mpc index 9431556642e..4d407e0055b 100644 --- a/TAO/examples/OBV/Typed_Events/Typed_Events.mpc +++ b/TAO/examples/OBV/Typed_Events/Typed_Events.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(*server): taoexe, utils, portableserver, valuetype, minimum_corba { +project(*server): taoserver, utils, valuetype, minimum_corba { Source_Files { Server_i.cpp Event_Types_impl.cpp @@ -10,7 +10,9 @@ project(*server): taoexe, utils, portableserver, valuetype, minimum_corba { } } -project(*client): taoexe, utils, portableserver, valuetype, minimum_corba { +project(*client): taoserver, utils, valuetype, minimum_corba { + exename = client + after += *server Source_Files { Client_i.cpp Event_Types_impl.cpp diff --git a/TAO/orbsvcs/tests/Bug_2287_Regression/Bug_2287_Regression.mpc b/TAO/orbsvcs/tests/Bug_2287_Regression/Bug_2287_Regression.mpc index 5a457cc15fb..c37516456b5 100644 --- a/TAO/orbsvcs/tests/Bug_2287_Regression/Bug_2287_Regression.mpc +++ b/TAO/orbsvcs/tests/Bug_2287_Regression/Bug_2287_Regression.mpc @@ -2,7 +2,8 @@ // $Id$ project(*Client): taoserver, ftclientorb { - exename = client + after += *Server + exename = client Source_Files { client.cpp Hello.cpp |