diff options
| author | marina <marina@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-03-18 22:40:44 +0000 |
|---|---|---|
| committer | marina <marina@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-03-18 22:40:44 +0000 |
| commit | 3433e013e186f10e0de91935bcf0567a3102e38e (patch) | |
| tree | ffeab90e9e6abaeed92bba1daf124f1bd3bae985 /TAO/orbsvcs/tests | |
| parent | 04935c917bebfde2871f1a24e250dec48d93d554 (diff) | |
| download | ATCD-3433e013e186f10e0de91935bcf0567a3102e38e.tar.gz | |
Removed NT warnings.
Diffstat (limited to 'TAO/orbsvcs/tests')
| -rw-r--r-- | TAO/orbsvcs/tests/Simple_Naming/client.cpp | 33 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/Simple_Naming/client.h | 2 |
2 files changed, 22 insertions, 13 deletions
diff --git a/TAO/orbsvcs/tests/Simple_Naming/client.cpp b/TAO/orbsvcs/tests/Simple_Naming/client.cpp index 77e0f3f53f2..2922be204bb 100644 --- a/TAO/orbsvcs/tests/Simple_Naming/client.cpp +++ b/TAO/orbsvcs/tests/Simple_Naming/client.cpp @@ -271,12 +271,16 @@ MT_Test::svc (void) TAO_TRY_ENV); TAO_CHECK_ENV_EX (RESOLVE); - if (!CORBA::is_nil (result_object.in ()) - && result_object->id (TAO_TRY_ENV) == CosNaming_Client::OBJ1_ID) - TAO_CHECK_ENV_EX (RESOLVE); - ACE_DEBUG ((LM_DEBUG, - "Resolved name OK in thread %8.8x \n", - ACE_OS::thr_self ())); + if (!CORBA::is_nil (result_object.in ())) + { + CORBA::Short id = result_object->id (TAO_TRY_ENV); + TAO_CHECK_ENV_EX (RESOLVE); + + if (id == CosNaming_Client::OBJ1_ID) + ACE_DEBUG ((LM_DEBUG, + "Resolved name OK in thread %8.8x \n", + ACE_OS::thr_self ())); + } } TAO_CATCH (CosNaming::NamingContext::NotFound, ex) { @@ -442,12 +446,17 @@ Loop_Test::execute (TAO_Naming_Client &root_context) TAO_TRY_ENV); TAO_CHECK_ENV_EX (RESOLVE); - if (!CORBA::is_nil (result_object.in ()) - && result_object->id (TAO_TRY_ENV) == CosNaming_Client::OBJ1_ID) - TAO_CHECK_ENV_EX (RESOLVE); - ACE_DEBUG ((LM_DEBUG, - "Resolved name OK in process %8.8x \n", - ACE_OS::getpid ())); + + if (!CORBA::is_nil (result_object.in ())) + { + CORBA::Short id = result_object->id (TAO_TRY_ENV); + TAO_CHECK_ENV_EX (RESOLVE); + + if (id == CosNaming_Client::OBJ1_ID) + ACE_DEBUG ((LM_DEBUG, + "Resolved name OK in process %8.8x \n", + ACE_OS::getpid ())); + } } TAO_CATCH (CosNaming::NamingContext::NotFound, ex) { diff --git a/TAO/orbsvcs/tests/Simple_Naming/client.h b/TAO/orbsvcs/tests/Simple_Naming/client.h index 744035f99c6..49fff9c428b 100644 --- a/TAO/orbsvcs/tests/Simple_Naming/client.h +++ b/TAO/orbsvcs/tests/Simple_Naming/client.h @@ -254,7 +254,7 @@ public: // Initialize the client communication endpoint with server. // = Symbolic ids. - enum + enum OBJ_ID { OBJ1_ID = 5, OBJ2_ID = 6 |