diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-08-01 10:53:12 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-08-01 10:53:12 +0000 |
| commit | 01a58228d63eb0cb000e3672b1c665fd26ca85ec (patch) | |
| tree | cd0f540e412a1d257582f17b39be9c4d070fb314 | |
| parent | 555c87e957ba50576c6493291d1389e39d8762ec (diff) | |
| download | ATCD-01a58228d63eb0cb000e3672b1c665fd26ca85ec.tar.gz | |
Wed Aug 1 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 | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index dbf8222d2da..955dda6bf85 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,8 @@ +Wed Aug 1 10:52:12 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl> + + * tao/PortableServer/Collocated_Object_Proxy_Broker: + Disable the correct method for CORBA/e + Wed Aug 1 09:02:12 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl> * orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp: diff --git a/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.cpp b/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.cpp index 6285d4cd0e1..55e31f41113 100644 --- a/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.cpp +++ b/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.cpp @@ -94,7 +94,6 @@ 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) { @@ -129,8 +128,8 @@ namespace TAO return _tao_retval; } -#endif +#if !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) CORBA::Object_ptr Collocated_Object_Proxy_Broker::_get_component (CORBA::Object_ptr target) { @@ -169,6 +168,7 @@ namespace TAO return _tao_retval._retn (); } +#endif CORBA::InterfaceDef_ptr Collocated_Object_Proxy_Broker::_get_interface (CORBA::Object_ptr target) |