diff options
| author | mitza <mitza@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2008-08-11 16:24:43 +0000 |
|---|---|---|
| committer | mitza <mitza@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2008-08-11 16:24:43 +0000 |
| commit | 19ee30a56063ba5f5b27b37ddfc77c9b77c4dba3 (patch) | |
| tree | abdedbe5ae7b29d152b57423a9f353a1293a450f | |
| parent | fdd1ec0730c583e7733575eb6b477ea38b9d4ea0 (diff) | |
| download | ATCD-19ee30a56063ba5f5b27b37ddfc77c9b77c4dba3.tar.gz | |
ChangeLogTag: Mon Aug 11 16:23:52 UTC 2008 Adam Mitz <mitza@ociweb.com>
| -rw-r--r-- | TAO/ChangeLog | 11 | ||||
| -rw-r--r-- | TAO/MPC/config/bidir_giop.mpb | 2 | ||||
| -rw-r--r-- | TAO/tests/Bug_3068_Regression/Bug_3068_Regression.mpc | 4 |
3 files changed, 14 insertions, 3 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 2716df79e5f..64ed95ea7f4 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,14 @@ +Mon Aug 11 16:23:52 UTC 2008 Adam Mitz <mitza@ociweb.com> + + * MPC/config/bidir_giop.mpb: + + Added avoids_corba_e_micro as base. BiDir GIOP requires a child POA, + which makes it incompatible with CORBA/e Micro. + + * tests/Bug_3068_Regression/Bug_3068_Regression.mpc: + + Added "threads" as a base -- this test requires threads. + Mon Aug 11 15:39:15 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> * tao/Bind_Dispatcher_Guard.{h,cpp}: diff --git a/TAO/MPC/config/bidir_giop.mpb b/TAO/MPC/config/bidir_giop.mpb index 55b448e4f6a..4ef0867f990 100644 --- a/TAO/MPC/config/bidir_giop.mpb +++ b/TAO/MPC/config/bidir_giop.mpb @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project : taolib, pi { +project : taolib, pi, avoids_corba_e_micro { after += BiDir_GIOP libs += TAO_BiDirGIOP } diff --git a/TAO/tests/Bug_3068_Regression/Bug_3068_Regression.mpc b/TAO/tests/Bug_3068_Regression/Bug_3068_Regression.mpc index 6aa5cf5b0b7..fef53fc27cc 100644 --- a/TAO/tests/Bug_3068_Regression/Bug_3068_Regression.mpc +++ b/TAO/tests/Bug_3068_Regression/Bug_3068_Regression.mpc @@ -1,6 +1,6 @@ // $Id$ -project(*Server): taoserver, messaging, bidir_giop { +project(*Server): taoserver, messaging, bidir_giop, threads { exename = server Source_Files { test_i.cpp @@ -8,7 +8,7 @@ project(*Server): taoserver, messaging, bidir_giop { } } -project(*Client): taoserver, bidir_giop { +project(*Client): taoserver, bidir_giop, threads { exename = client Source_Files { test_i.cpp |