diff options
| author | Simon McQueen <simon.mcqueen@gmail.com> | 2005-09-29 16:31:04 +0000 |
|---|---|---|
| committer | Simon McQueen <simon.mcqueen@gmail.com> | 2005-09-29 16:31:04 +0000 |
| commit | 3ba33e364c6221b7f78f2b3f7f9d1c12d9489b5e (patch) | |
| tree | dbeeec24d7404077a42f9e397edd8c35e155db3b | |
| parent | 7bdc12b37c3c099624226cdca64b8973ecb29e9f (diff) | |
| download | ATCD-3ba33e364c6221b7f78f2b3f7f9d1c12d9489b5e.tar.gz | |
ChangeLogTag: Thu Sep 29 17:25:39 2005 Simon McQueen <sm@prismtech.com>
| -rw-r--r-- | TAO/ChangeLog | 7 | ||||
| -rwxr-xr-x | TAO/orbsvcs/tests/Bug_2247_Regression/test_i.cpp | 4 | ||||
| -rwxr-xr-x | TAO/orbsvcs/tests/Bug_2247_Regression/test_i.h | 4 |
3 files changed, 11 insertions, 4 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 18ff3a91457..5c12e1648b7 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,10 @@ +Thu Sep 29 17:25:39 2005 Simon McQueen <sm@prismtech.com> + + * orbsvcs/tests/Bug_2247_Regression/test_i.cpp: + * orbsvcs/tests/Bug_2247_Regression/test_i.h: + + Fixing the inevitable emulated exception errors. + Thu Sep 29 10:02:19 2005 Chris Cleeland <cleeland_c@ociweb.com> * orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.cpp: diff --git a/TAO/orbsvcs/tests/Bug_2247_Regression/test_i.cpp b/TAO/orbsvcs/tests/Bug_2247_Regression/test_i.cpp index e76f93f11ab..6264149b61e 100755 --- a/TAO/orbsvcs/tests/Bug_2247_Regression/test_i.cpp +++ b/TAO/orbsvcs/tests/Bug_2247_Regression/test_i.cpp @@ -32,7 +32,7 @@ Simple_Server_i::remote_call (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /*ACE_ENV_SINGLE_ char* -Simple_Server_i::shutdown (const char* key ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Simple_Server_i::shutdown (const char* key ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "SERVER(%s)> executing shutdown()\n", _key.in())); @@ -52,7 +52,7 @@ Simple_Server_i::shutdown (const char* key ACE_ENV_SINGLE_ARG_DECL_NOT_USED) } char* -Simple_Server_i::abort (const char* key ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Simple_Server_i::abort (const char* key ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "SERVER(%s)> executing abort()\n", _key.in())); diff --git a/TAO/orbsvcs/tests/Bug_2247_Regression/test_i.h b/TAO/orbsvcs/tests/Bug_2247_Regression/test_i.h index 110555b959c..f00ae655410 100755 --- a/TAO/orbsvcs/tests/Bug_2247_Regression/test_i.h +++ b/TAO/orbsvcs/tests/Bug_2247_Regression/test_i.h @@ -24,10 +24,10 @@ public: char* remote_call (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - char* shutdown (const char* key ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + char* shutdown (const char* key ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - char* abort (const char* key ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + char* abort (const char* key ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); private: |