diff options
author | Ossama Othman <ossama-othman@users.noreply.github.com> | 2005-04-08 08:47:19 +0000 |
---|---|---|
committer | Ossama Othman <ossama-othman@users.noreply.github.com> | 2005-04-08 08:47:19 +0000 |
commit | 5918ebbeccab22c1994831c56b87bfe2ef8286c7 (patch) | |
tree | eeddb85ca5f688464dfd11fd2ecb3add7c570ecf | |
parent | 05c32ad6bfd35f2f4f7b314907d462815146210f (diff) | |
download | ATCD-5918ebbeccab22c1994831c56b87bfe2ef8286c7.tar.gz |
ChangeLogTag:Fri Apr 8 01:45:09 2005 Ossama Othman <ossama@dre.vanderbilt.edu>
-rw-r--r-- | TAO/ChangeLog | 7 | ||||
-rw-r--r-- | TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.cpp | 10 |
2 files changed, 14 insertions, 3 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 1dd2e8784ed..07e728678a8 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,10 @@ +Fri Apr 8 01:45:09 2005 Ossama Othman <ossama@dre.vanderbilt.edu> + + * orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.cpp + (create_dii_request): + + Fixed emulated exception macro usage. + Fri Apr 8 09:44:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl> * tao/Strategies/advanced_resource.cpp: diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.cpp index 62688c9f2d6..e646d208b92 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.cpp +++ b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.cpp @@ -283,10 +283,14 @@ IFR_DII_Client::create_dii_request (ACE_ENV_SINGLE_ARG_DECL) // more of it. for (CORBA::ULong i = 0; i < length; ++i) { + CORBA::TCKind const kind = + params[i].type->kind (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_CHECK; + switch (params[i].mode) { case CORBA::PARAM_IN: - if (params[i].type->kind () == CORBA::tk_string + if (kind == CORBA::tk_string && ACE_OS::strcmp (params[i].name.in (), "artist") == 0) { // The servant will match the substring 'Beatles'. @@ -295,7 +299,7 @@ IFR_DII_Client::create_dii_request (ACE_ENV_SINGLE_ARG_DECL) break; case CORBA::PARAM_INOUT: - if (params[i].type->kind () == CORBA::tk_string + if (kind == CORBA::tk_string && ACE_OS::strcmp (params[i].name.in (), "title") == 0) { // This isn't the exact title, but the servant will find the @@ -306,7 +310,7 @@ IFR_DII_Client::create_dii_request (ACE_ENV_SINGLE_ARG_DECL) break; case CORBA::PARAM_OUT: { - if (params[i].type->kind () == CORBA::tk_float + if (kind == CORBA::tk_float && ACE_OS::strcmp (params[i].name.in (), "price") == 0) { CORBA::Float tmp = -1.0f; |