diff options
author | Johnny Willemsen <jwillemsen@remedy.nl> | 2005-07-26 11:58:46 +0000 |
---|---|---|
committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2005-07-26 11:58:46 +0000 |
commit | 058318c9c06c9d1f96c42ce70e02e8b414f3164a (patch) | |
tree | 592ee7d0bb5ffdf8c3794a0252ab55d9f99fc07c | |
parent | a4a4dcbb2dd3688f65490b001845db95e0942566 (diff) | |
download | ATCD-058318c9c06c9d1f96c42ce70e02e8b414f3164a.tar.gz |
ChangeLogTag: Tue Jul 26 11:56:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>
5 files changed, 16 insertions, 4 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 0da36bdf844..7b59c969186 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,8 @@ +Tue Jul 26 11:56:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl> + + * TAO_IDL/be/be_interface.cpp: + Fixed problem in dynamic hash lookup table generation + Tue Jul 26 10:45:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl> * tests/Bug_1020_Basic_Regression/Server_Task.cpp: diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/client.cpp b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/client.cpp index 606f68fca22..52caf89e452 100644 --- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/client.cpp +++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/client.cpp @@ -113,7 +113,8 @@ server_test (Test_ptr server ACE_ENV_ARG_DECL) ACE_TRY { - server->server_test (i ACE_ENV_ARG_PARAMETER); + CORBA::ULongSeq_var ulongseq; + server->server_test (i, ulongseq.out () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (i == 1) diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/test.idl b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/test.idl index f9d55838b03..b536954c01f 100644 --- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/test.idl +++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/test.idl @@ -12,6 +12,8 @@ */ //============================================================================= +#include <ULongSeq.pidl> + interface Test { typedef short TestScenario; @@ -28,7 +30,7 @@ interface Test void client_test (in TestScenario scenario) raises (X, UnknownScenario); /// The server-side test operation. - void server_test (in TestScenario scenario) raises (X, UnknownScenario); + void server_test (in TestScenario scenario, out CORBA::ULongSeq myseq) raises (X, UnknownScenario); /// Shutdown the server. oneway void shutdown (); diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/test_i.cpp b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/test_i.cpp index 34463868f5a..17dee50ac55 100644 --- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/test_i.cpp +++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/test_i.cpp @@ -34,12 +34,15 @@ test_i::client_test (Test::TestScenario scenario } void -test_i::server_test (Test::TestScenario scenario +test_i::server_test (Test::TestScenario scenario, + CORBA::ULongSeq_out myseq ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((Test::X, Test::UnknownScenario, CORBA::SystemException)) { + myseq = new CORBA::ULongSeq; + switch (scenario) { case 1: diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/test_i.h b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/test_i.h index 2d55095fe78..604d4ffb432 100644 --- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/test_i.h +++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/test_i.h @@ -40,7 +40,8 @@ public: CORBA::SystemException)); /// The server-side test operation. - virtual void server_test (Test::TestScenario scenario + virtual void server_test (Test::TestScenario scenario, + CORBA::ULongSeq_out myseq ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((Test::X, Test::UnknownScenario, |