diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-07-31 10:53:08 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-07-31 10:53:08 +0000 |
| commit | b7b761823df232a12643e5871c665801d9162e52 (patch) | |
| tree | a19cd9c5eb7eed71b951248e8245a15d93b57681 | |
| parent | 18672e491c457625d0c8b5a9f442d07081fd6244 (diff) | |
| download | ATCD-b7b761823df232a12643e5871c665801d9162e52.tar.gz | |
Tue Jul 31 10:52:12 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | TAO/ChangeLog | 5 | ||||
| -rw-r--r-- | TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.cpp | 2 | ||||
| -rw-r--r-- | TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.h | 2 |
3 files changed, 9 insertions, 0 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 13aeeb35f07..ab0a141a0df 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,8 @@ +Tue Jul 31 10:52:12 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl> + + * tao/Collocated_Object_Proxy_Broker.{h,cpp}: + non_existent is not needed for CORBA/e + Tue Jul 31 07:22:12 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl> * tao/Abstract_Servant_Base.{h,cpp,inl}: diff --git a/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.cpp b/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.cpp index d064dc51e57..6285d4cd0e1 100644 --- a/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.cpp +++ b/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.cpp @@ -94,6 +94,7 @@ namespace TAO return _tao_retval; } +#if !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) CORBA::Boolean Collocated_Object_Proxy_Broker::_non_existent (CORBA::Object_ptr target) { @@ -128,6 +129,7 @@ namespace TAO return _tao_retval; } +#endif CORBA::Object_ptr Collocated_Object_Proxy_Broker::_get_component (CORBA::Object_ptr target) diff --git a/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.h b/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.h index a07598ca017..2b74af5a912 100644 --- a/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.h +++ b/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.h @@ -53,7 +53,9 @@ namespace TAO virtual CORBA::InterfaceDef * _get_interface (CORBA::Object_ptr target); +#if !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) virtual CORBA::Object_ptr _get_component (CORBA::Object_ptr target); +#endif virtual char * _repository_id (CORBA::Object_ptr target); |