diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-07-31 10:55:14 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-07-31 10:55:14 +0000 |
| commit | 09393bf0fc2849f763be49d80d1570ffeacfb0e7 (patch) | |
| tree | 1c6de53e41a49af0d55de1c65705baf1531fae9b | |
| parent | b7b761823df232a12643e5871c665801d9162e52 (diff) | |
| download | ATCD-09393bf0fc2849f763be49d80d1570ffeacfb0e7.tar.gz | |
Tue Jul 31 10:54:12 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | TAO/ChangeLog | 10 | ||||
| -rw-r--r-- | TAO/tao/Codeset_Translator_Base.h | 4 | ||||
| -rw-r--r-- | TAO/tao/Collocation_Proxy_Broker.h | 6 | ||||
| -rw-r--r-- | TAO/tao/Collocation_Resolver.h | 3 | ||||
| -rw-r--r-- | TAO/tao/Object_Proxy_Broker.h | 2 |
5 files changed, 17 insertions, 8 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index ab0a141a0df..88d69431cc0 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,13 @@ +Tue Jul 31 10:54:12 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl> + + * tao/Object_Proxy_Broker.h: + non_existent is not needed for CORBA/e + + * tao/Codeset_Translator_Base.h: + * tao/Collocation_Proxy_Broker.h: + * tao/Collocation_Resolver.h: + Layout changes + Tue Jul 31 10:52:12 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl> * tao/Collocated_Object_Proxy_Broker.{h,cpp}: diff --git a/TAO/tao/Codeset_Translator_Base.h b/TAO/tao/Codeset_Translator_Base.h index 661ecfe3251..0b17bdc4cde 100644 --- a/TAO/tao/Codeset_Translator_Base.h +++ b/TAO/tao/Codeset_Translator_Base.h @@ -55,11 +55,11 @@ public: /// Get the native codeset ID from the base. There is no reasonable /// default for this method, so it is left abstract. - virtual CONV_FRAME::CodeSetId ncs () const = 0; + virtual CONV_FRAME::CodeSetId ncs (void) const = 0; /// Get the translated codeset ID from the base. There is no reasonable /// default for this method, so it is left abstract. - virtual CONV_FRAME::CodeSetId tcs () const = 0; + virtual CONV_FRAME::CodeSetId tcs (void) const = 0; /// Assign the translator to the supplied input CDR. This is left abstract /// since the base base does not have a reference to the actual translator diff --git a/TAO/tao/Collocation_Proxy_Broker.h b/TAO/tao/Collocation_Proxy_Broker.h index 65f5baba850..301063f7d7b 100644 --- a/TAO/tao/Collocation_Proxy_Broker.h +++ b/TAO/tao/Collocation_Proxy_Broker.h @@ -54,8 +54,7 @@ namespace TAO virtual ~Collocation_Proxy_Broker (void); - virtual Collocation_Strategy get_strategy (CORBA::Object_ptr obj - ) = 0; + virtual Collocation_Strategy get_strategy (CORBA::Object_ptr obj) = 0; virtual void dispatch (CORBA::Object_ptr obj, CORBA::Object_out forward_obj, @@ -63,8 +62,7 @@ namespace TAO int num_args, const char * op, size_t op_len, - Collocation_Strategy strategy - ) = 0; + Collocation_Strategy strategy) = 0; }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Collocation_Resolver.h b/TAO/tao/Collocation_Resolver.h index 30aa76ca0f5..f90c6fd39ac 100644 --- a/TAO/tao/Collocation_Resolver.h +++ b/TAO/tao/Collocation_Resolver.h @@ -50,8 +50,7 @@ public: virtual ~TAO_Collocation_Resolver (void); /// Is @a object collocated? - virtual CORBA::Boolean is_collocated (CORBA::Object_ptr object - ) const = 0; + virtual CORBA::Boolean is_collocated (CORBA::Object_ptr object) const = 0; }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Object_Proxy_Broker.h b/TAO/tao/Object_Proxy_Broker.h index 4bcc45d4ced..ff7d58ac6f9 100644 --- a/TAO/tao/Object_Proxy_Broker.h +++ b/TAO/tao/Object_Proxy_Broker.h @@ -64,7 +64,9 @@ namespace TAO virtual CORBA::InterfaceDef *_get_interface (CORBA::Object_ptr target) = 0; +#if !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) virtual CORBA::Object_ptr _get_component (CORBA::Object_ptr target) = 0; +#endif virtual char * _repository_id (CORBA::Object_ptr target) = 0; |