diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2008-01-13 18:53:41 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2008-01-13 18:53:41 +0000 |
| commit | 7dee411d4af1cd63a5308d9fa626a2e63ca30d96 (patch) | |
| tree | 43990d7348bb29ff7bdc575d6caaaeda171e3894 | |
| parent | 99f0e716461dc16416e289a7b9049dccc932dec7 (diff) | |
| download | ATCD-7dee411d4af1cd63a5308d9fa626a2e63ca30d96.tar.gz | |
Sun Jan 13 18:44:12 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | TAO/ChangeLog | 6 | ||||
| -rw-r--r-- | TAO/tests/Bug_3108_Regression/client.cpp | 2 | ||||
| -rw-r--r-- | TAO/tests/DSI_AMH/Roundtrip.cpp | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 5ed6664e930..3494f37d945 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,9 @@ +Sun Jan 13 18:44:12 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> + + * tests/Bug_3108_Regression/client.cpp: + * tests/DSI_AMH/Roundtrip.cpp: + Fixed conversion warnings + Wed Jan 9 11:54:12 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> * tests/Servant_To_Reference_Test/run_test.pl: diff --git a/TAO/tests/Bug_3108_Regression/client.cpp b/TAO/tests/Bug_3108_Regression/client.cpp index e9f1d4dfda5..d1d127554b0 100644 --- a/TAO/tests/Bug_3108_Regression/client.cpp +++ b/TAO/tests/Bug_3108_Regression/client.cpp @@ -83,7 +83,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) CORBA::Object_var obj = orb->string_to_object(ior); test_var server = test::_narrow(obj.in ()); - if (CORBA::is_nil(server)) + if (CORBA::is_nil(server.in ())) { ACE_ERROR_RETURN ((LM_DEBUG, "Nil reference <%s>\n", diff --git a/TAO/tests/DSI_AMH/Roundtrip.cpp b/TAO/tests/DSI_AMH/Roundtrip.cpp index b903e653b70..a3451a93331 100644 --- a/TAO/tests/DSI_AMH/Roundtrip.cpp +++ b/TAO/tests/DSI_AMH/Roundtrip.cpp @@ -57,7 +57,7 @@ Roundtrip::invoke (CORBA::ServerRequest_ptr request, CORBA::NamedValue_var result = 0; this->orb_->create_named_value (result.out()); *(result->value()) = result_any; - rh->invoke_reply (list, result); + rh->invoke_reply (list, result.in ()); return; } |