diff options
Diffstat (limited to 'TAO/tao/Object.h')
| -rw-r--r-- | TAO/tao/Object.h | 60 |
1 files changed, 18 insertions, 42 deletions
diff --git a/TAO/tao/Object.h b/TAO/tao/Object.h index e35974ef463..977838fd88b 100644 --- a/TAO/tao/Object.h +++ b/TAO/tao/Object.h @@ -43,8 +43,7 @@ public: // return a NUL object static CORBA_Object_ptr _narrow (CORBA_Object_ptr obj, - CORBA_Environment &TAO_IN_ENV = - CORBA::default_environment ()); + CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); // no-op it is just here to simplify some templates. // These calls correspond to over-the-wire operations, or at least @@ -54,8 +53,7 @@ public: // appropriate. virtual CORBA::Boolean _is_a (const CORBA::Char *logical_type_id, - CORBA_Environment &TAO_IN_ENV = - CORBA::default_environment ()); + CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); // determine if we are of the type specified by the "logical_type_id" virtual const char* _interface_repository_id (void) const; @@ -68,55 +66,37 @@ public: virtual CORBA::Boolean _is_collocated (void) const; // are we collocated with the servant? - virtual CORBA::Boolean _non_existent (CORBA_Environment &TAO_IN_ENV = - CORBA::default_environment ()); + virtual CORBA::Boolean _non_existent (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); #if !defined (TAO_HAS_MINIMUM_CORBA) virtual CORBA::ImplementationDef_ptr - _get_implementation (CORBA_Environment &TAO_IN_ENV = - CORBA::default_environment ()); + _get_implementation (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); // This method is deprecated in the CORBA 2.2 spec, we just return 0 // every time. - virtual CORBA::InterfaceDef_ptr _get_interface (CORBA_Environment &TAO_IN_ENV = - CORBA::default_environment ()); - - // Interface repository related operations. - - // DII operations to create a request. - // - // The mapping for create_request is split into two forms, - // corresponding to the two usage styles described in CORBA section - // 6.2.1. - - virtual void _create_request (CORBA::Context_ptr ctx, - const CORBA::Char *operation, - CORBA::NVList_ptr arg_list, - CORBA::NamedValue_ptr result, - CORBA::Request_ptr &request, - CORBA::Flags req_flags, - CORBA_Environment &TAO_IN_ENV = - CORBA::default_environment ()); + virtual CORBA::InterfaceDef_ptr _get_interface (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + // Interface repository related operation virtual void _create_request (CORBA::Context_ptr ctx, const CORBA::Char *operation, CORBA::NVList_ptr arg_list, CORBA::NamedValue_ptr result, - CORBA::ExceptionList_ptr exclist, - CORBA::ContextList_ptr ctxtlist, CORBA::Request_ptr &request, CORBA::Flags req_flags, - CORBA_Environment &TAO_IN_ENV = - CORBA::default_environment ()); - + CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + // DII operation to create a request. + // + // The mapping for create_request is split into two forms, + // corresponding to the two usage styles described in CORBA section + // 6.2.1. + // // The default implementation of this method uses the same simple, // multi-protocol remote invocation interface as is assumed by the // calls above ... that's how it can have a default implementation. virtual CORBA::Request_ptr _request (const CORBA::Char *operation, - CORBA_Environment &TAO_IN_ENV = - CORBA::default_environment ()); + CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); // DII operation to create a request. #endif /* TAO_HAS_MINIMUM_CORBA */ @@ -151,8 +131,7 @@ public: #endif /* TAO_HAS_CORBA_MESSAGING */ virtual CORBA::ULong _hash (CORBA::ULong maximum, - CORBA_Environment &TAO_IN_ENV = - CORBA::default_environment ()); + CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); // Return a (potentially non-unique) hash value for this object. // This method relies on the representation of the object // reference's private state. Since that changes easily (when @@ -160,15 +139,13 @@ public: // implementation. virtual CORBA::Boolean _is_equivalent (CORBA::Object_ptr other_obj, - CORBA_Environment &TAO_IN_ENV = - CORBA::default_environment ()); + CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); // Try to determine if this object is the same as <other_obj>. This // method relies on the representation of the object reference's // private state. Since that changes easily (when different ORB // protocols are in use) there is no default implementation. - virtual TAO_ObjectKey *_key (CORBA_Environment &TAO_IN_ENV = - CORBA::default_environment ()); + virtual TAO_ObjectKey *_key (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); // Return the object key as an out parameter. Caller should release // return value when finished with it. @@ -292,8 +269,7 @@ public: // destructor virtual void _downcast (CORBA_Object* base_ptr, - CORBA_Environment &TAO_IN_ENV = - CORBA::default_environment ()) = 0; + CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0; virtual CORBA_Object* _upcast (void) = 0; virtual void _release (void) = 0; }; |