diff options
Diffstat (limited to 'TAO')
| -rw-r--r-- | TAO/ChangeLog-98c | 44 | ||||
| -rw-r--r-- | TAO/tao/iiopobj.cpp | 8 | ||||
| -rw-r--r-- | TAO/tao/iiopobj.h | 7 |
3 files changed, 29 insertions, 30 deletions
diff --git a/TAO/ChangeLog-98c b/TAO/ChangeLog-98c index a01dccb4d3f..f5ac6148b4d 100644 --- a/TAO/ChangeLog-98c +++ b/TAO/ChangeLog-98c @@ -1,24 +1,14 @@ +Sat Nov 15 17:34:11 1997 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu> + + * tao/iiopobj: Fixed _get_name() so that it doesn't allocate + memory. This should fix some subtle problems. + Sat Nov 15 17:33:15 1997 Carlos O'Ryan <coryan@macarena.cs.wustl.edu> * TAO_IDL/be/be_operation.cpp: Fixed typo in generated code: s/_tao_enviroment/_tao_environment/ -Sat Nov 15 12:32:37 1997 Aniruddha Gokhale <gokhale@mambo.cs.wustl.edu> - - * TAO_IDL/be/be_typedef.cpp: Added code to generate the typecode - structure for typedefs. These use the tk_alias kind field. - - * TAO_IDL/be/{be_union,be_state}.cpp: Improvements to union with - string members. However, this is still incomplete and the will be - done by the next couple of commits. - - * tests/Cubit/TAO/IDL_Cubit/cubit_i.cpp: Removed the ACE_DEBUG - stmt for printing object keys. - - -Sat Nov 15 12:27:59 1997 Carlos O'Ryan <coryan@macarena.cs.wustl.edu> - * TAO_IDL/be/be_field.cpp: Only generate the inline members of the field type if the type is not imported. @@ -29,13 +19,6 @@ Sat Nov 15 12:27:59 1997 Carlos O'Ryan <coryan@macarena.cs.wustl.edu> Also removed temporary files *unless* we are on Win32, were removing the file and keeping it open fails. -Sat Nov 15 12:19:55 1997 Nanbor Wang <nw1@merengue.cs.wustl.edu> - - * TAO_IDL/be/be_codegen.cpp: Changed two loop counters from type - int to type size_t. - -Sat Nov 15 11:23:46 1997 Carlos O'Ryan <coryan@macarena.cs.wustl.edu> - * TAO_IDL/include/idl_global.h: * TAO_IDL/util/utl_global.cpp: Added routines to obtain the generated names of any IDL file, @@ -48,6 +31,23 @@ Sat Nov 15 11:23:46 1997 Carlos O'Ryan <coryan@macarena.cs.wustl.edu> * tao/params.cpp: Initialize name_service_port_ to zero in the constructor. +Sat Nov 15 12:32:37 1997 Aniruddha Gokhale <gokhale@mambo.cs.wustl.edu> + + * TAO_IDL/be/be_typedef.cpp: Added code to generate the typecode + structure for typedefs. These use the tk_alias kind field. + + * TAO_IDL/be/{be_union,be_state}.cpp: Improvements to union with + string members. However, this is still incomplete and the will be + done by the next couple of commits. + + * tests/Cubit/TAO/IDL_Cubit/cubit_i.cpp: Removed the ACE_DEBUG + stmt for printing object keys. + +Sat Nov 15 12:19:55 1997 Nanbor Wang <nw1@merengue.cs.wustl.edu> + + * TAO_IDL/be/be_codegen.cpp: Changed two loop counters from type + int to type size_t. + Sat Nov 15 01:33:08 1997 Douglas C. Schmidt <schmidt@cs.wustl.edu> * TAO version 0.0.30, released Sat Nov 15 01:33:08 1997. diff --git a/TAO/tao/iiopobj.cpp b/TAO/tao/iiopobj.cpp index 7426ee8a6f7..feed317dc41 100644 --- a/TAO/tao/iiopobj.cpp +++ b/TAO/tao/iiopobj.cpp @@ -278,14 +278,10 @@ IIOP_Object::QueryInterface (REFIID riid, } //TAO extensions -char * +const char * IIOP_Object::_get_name (CORBA::Environment &) { - char *name = CORBA::string_alloc (this->profile.object_key.length); - ACE_OS::memcpy (name, - this->profile.object_key.buffer, - this->profile.object_key.length); - return name; + return (const char *) this->profile.object_key.buffer; } // It will usually be used by the _bind call. diff --git a/TAO/tao/iiopobj.h b/TAO/tao/iiopobj.h index 7dc0b5659da..1d982f40656 100644 --- a/TAO/tao/iiopobj.h +++ b/TAO/tao/iiopobj.h @@ -218,8 +218,11 @@ public: HRESULT __stdcall QueryInterface (REFIID type_id, void **ppv); - virtual char *_get_name (CORBA::Environment &env); - // Get the underlying object key. + virtual const char *_get_name (CORBA::Environment &env); + // Get the underlying object key, which is stored as a + // NUL-terminated character string. Note that this does not + // allocate any new memory, so this return value should not be + // changed by the caller. IIOP::Profile profile; // @@ Please document me (this should be private). |