diff options
author | elliott_c <ocielliottc@users.noreply.github.com> | 2008-03-28 14:57:44 +0000 |
---|---|---|
committer | elliott_c <ocielliottc@users.noreply.github.com> | 2008-03-28 14:57:44 +0000 |
commit | ff584ebc5d572fa9baa38f90536b84075875e6bd (patch) | |
tree | d7f8882430a912fbd8b35becec152726a521e541 | |
parent | 328439e83872b7b36e973da52d0dc4e2a5325628 (diff) | |
download | ATCD-ff584ebc5d572fa9baa38f90536b84075875e6bd.tar.gz |
ChangeLogTag: Fri Mar 28 14:57:25 UTC 2008 Chad Elliott <elliott_c@ociweb.com>
-rw-r--r-- | TAO/ChangeLog | 7 | ||||
-rw-r--r-- | TAO/tao/Invocation_Adapter.cpp | 2 | ||||
-rw-r--r-- | TAO/tao/LocateRequest_Invocation_Adapter.cpp | 2 |
3 files changed, 9 insertions, 2 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 8e1bca45ffa..8e2678666ec 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,10 @@ +Fri Mar 28 14:57:25 UTC 2008 Chad Elliott <elliott_c@ociweb.com> + + * tao/Invocation_Adapter.cpp: + * tao/LocateRequest_Invocation_Adapter.cpp: + + Use .in() on a var to avoid warnings from gcc. + Fri Mar 28 14:34:35 UTC 2008 Chad Elliott <elliott_c@ociweb.com> * orbsvcs/orbsvcs/CosNaming_Serv.mpc: diff --git a/TAO/tao/Invocation_Adapter.cpp b/TAO/tao/Invocation_Adapter.cpp index 8ebdc4f6ba4..f3dbbb3c383 100644 --- a/TAO/tao/Invocation_Adapter.cpp +++ b/TAO/tao/Invocation_Adapter.cpp @@ -359,7 +359,7 @@ namespace TAO TAO_Stub *stubobj = 0; bool nil_forward_ref = false; - if (CORBA::is_nil (effective_target)) + if (CORBA::is_nil (effective_target.in ())) nil_forward_ref = true; else { diff --git a/TAO/tao/LocateRequest_Invocation_Adapter.cpp b/TAO/tao/LocateRequest_Invocation_Adapter.cpp index 18d7eb0bbbd..73854c092df 100644 --- a/TAO/tao/LocateRequest_Invocation_Adapter.cpp +++ b/TAO/tao/LocateRequest_Invocation_Adapter.cpp @@ -133,7 +133,7 @@ namespace TAO TAO_Stub *stubobj = 0; bool nil_forward_ref = false; - if (CORBA::is_nil (effective_target)) + if (CORBA::is_nil (effective_target.in ())) nil_forward_ref = true; else { |