diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2005-02-18 09:07:14 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2005-02-18 09:07:14 +0000 |
| commit | 685cbd31f0c2b28e550cff1226b6dea3f3150136 (patch) | |
| tree | 91ba7fc4584511f31379702bdcf543da966f7f78 /TAO/tests/ORT | |
| parent | 872553f0d5680b863cd6b1948c68ca20a7269e46 (diff) | |
| download | ATCD-685cbd31f0c2b28e550cff1226b6dea3f3150136.tar.gz | |
ChangeLogTag: Fri Feb 18 17:04:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>
Diffstat (limited to 'TAO/tests/ORT')
| -rw-r--r-- | TAO/tests/ORT/ORT.mpc | 4 | ||||
| -rw-r--r-- | TAO/tests/ORT/ORT_test_IORInterceptor.cpp | 2 | ||||
| -rw-r--r-- | TAO/tests/ORT/ServerORBInitializer.cpp | 4 | ||||
| -rw-r--r-- | TAO/tests/ORT/ServerRequestInterceptor.h | 3 |
4 files changed, 7 insertions, 6 deletions
diff --git a/TAO/tests/ORT/ORT.mpc b/TAO/tests/ORT/ORT.mpc index bce316fb85d..d29f792f22c 100644 --- a/TAO/tests/ORT/ORT.mpc +++ b/TAO/tests/ORT/ORT.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(Test_ORT_Server): taoexe, portableserver, objreftemplate, iorinterceptor { +project(Test_ORT_Server): taoserver, objreftemplate, iorinterceptor { requires += interceptors IDL_Files { @@ -23,7 +23,7 @@ project(Test_ORT_Server): taoexe, portableserver, objreftemplate, iorinterceptor } -project(Test_ORT_Client): taoexe { +project(Test_ORT_Client): taoclient { requires += interceptors after += Test_ORT_Server diff --git a/TAO/tests/ORT/ORT_test_IORInterceptor.cpp b/TAO/tests/ORT/ORT_test_IORInterceptor.cpp index c627f27ca49..33ecd4d3399 100644 --- a/TAO/tests/ORT/ORT_test_IORInterceptor.cpp +++ b/TAO/tests/ORT/ORT_test_IORInterceptor.cpp @@ -68,7 +68,7 @@ ORT_test_IORInterceptor::components_established ( ObjectReferenceFactory (old_orf.in ()), CORBA::NO_MEMORY ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); ACE_CHECK; diff --git a/TAO/tests/ORT/ServerORBInitializer.cpp b/TAO/tests/ORT/ServerORBInitializer.cpp index 49bfb52abb0..1058b2bd9ad 100644 --- a/TAO/tests/ORT/ServerORBInitializer.cpp +++ b/TAO/tests/ORT/ServerORBInitializer.cpp @@ -49,7 +49,7 @@ ServerORBInitializer::post_init ( poa_current.in ()), CORBA::NO_MEMORY ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); ACE_CHECK; @@ -68,7 +68,7 @@ ServerORBInitializer::post_init ( ORT_test_IORInterceptor, CORBA::NO_MEMORY ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); ACE_CHECK; diff --git a/TAO/tests/ORT/ServerRequestInterceptor.h b/TAO/tests/ORT/ServerRequestInterceptor.h index d0575cbd5e4..a501741d104 100644 --- a/TAO/tests/ORT/ServerRequestInterceptor.h +++ b/TAO/tests/ORT/ServerRequestInterceptor.h @@ -26,7 +26,8 @@ #include "tao/LocalObject.h" #include "tao/CORBA_String.h" -#include "tao/PortableServer/PortableServerC.h" +#include "tao/PortableServer/PortableServer.h" +#include "tao/PortableServer/PS_CurrentC.h" #if defined(_MSC_VER) |