diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2006-07-21 08:39:56 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2006-07-21 08:39:56 +0000 |
| commit | fd0df83b3bf391d2fbeae50e5e53d03eed32f496 (patch) | |
| tree | 11bd41886ba70d2500cb42e5980fe940f29f022e | |
| parent | bee076f88adbdd0d59738a1112f024fd062faa70 (diff) | |
| download | ATCD-fd0df83b3bf391d2fbeae50e5e53d03eed32f496.tar.gz | |
ChangeLogTag: Fri Jul 21 08:38:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | TAO/tao/Object_T.cpp | 10 | ||||
| -rw-r--r-- | TAO/utils/catior/catior.cpp | 1 |
2 files changed, 6 insertions, 5 deletions
diff --git a/TAO/tao/Object_T.cpp b/TAO/tao/Object_T.cpp index 9ff642cda69..6a6808b2738 100644 --- a/TAO/tao/Object_T.cpp +++ b/TAO/tao/Object_T.cpp @@ -23,11 +23,11 @@ namespace TAO return T::_nil (); } - CORBA::Boolean is_it = obj->_is_a (repo_id - ACE_ENV_ARG_PARAMETER); + CORBA::Boolean const is_it = obj->_is_a (repo_id + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (T::_nil ()); - if (is_it == 0) + if (is_it == false) { return T::_nil (); } @@ -98,7 +98,7 @@ namespace TAO stub->_incr_refcnt (); - bool collocated = + bool const collocated = !CORBA::is_nil (stub->servant_orb_var ().in ()) && stub->optimize_collocation_objects () && obj->_is_collocated () @@ -106,7 +106,7 @@ namespace TAO ACE_NEW_THROW_EX (proxy, T (stub, - collocated ? 1 : 0, + collocated, obj->_servant ()), CORBA::NO_MEMORY ()); return proxy; diff --git a/TAO/utils/catior/catior.cpp b/TAO/utils/catior/catior.cpp index f8df799c965..90a8409fb8e 100644 --- a/TAO/utils/catior/catior.cpp +++ b/TAO/utils/catior/catior.cpp @@ -28,6 +28,7 @@ #include "tao/ORB_Constants.h" #include "tao/Transport_Acceptor.h" #include "tao/IIOP_EndpointsC.h" +#include "tao/Tagged_Components.h" #include "tao/CDR.h" #include "ace/Codeset_Registry.h" #include "ace/Get_Opt.h" |