diff options
| author | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-01-19 22:40:13 +0000 |
|---|---|---|
| committer | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-01-19 22:40:13 +0000 |
| commit | 80423e99b8020843a4a2aafc3c76f41694037c76 (patch) | |
| tree | b1af1e1e60d5177930d947af42b34909508fb668 | |
| parent | 4651c3ee1586f1a907bcb4d47a8b6846eae93efe (diff) | |
| download | ATCD-80423e99b8020843a4a2aafc3c76f41694037c76.tar.gz | |
ChangeLogTag:Mon Jan 19 16:36:22 1998 Carlos O'Ryan <coryan@cs.wustl.edu>
| -rw-r--r-- | TAO/ChangeLog-98c | 12 | ||||
| -rw-r--r-- | TAO/tao/iiopobj.cpp | 8 | ||||
| -rw-r--r-- | TAO/tao/iiopobj.h | 2 | ||||
| -rw-r--r-- | TAO/tao/objkeyC.h | 1 |
4 files changed, 21 insertions, 2 deletions
diff --git a/TAO/ChangeLog-98c b/TAO/ChangeLog-98c index 8686f2dc4f1..9f3aa0ef40a 100644 --- a/TAO/ChangeLog-98c +++ b/TAO/ChangeLog-98c @@ -1,3 +1,15 @@ +Mon Jan 19 16:36:22 1998 Carlos O'Ryan <coryan@cs.wustl.edu> + + * tao/iiopobj.h: + * tao/iiopobj.cpp: + Added a missed in action key() method to IIOP_Object. + + * tao/stub.h: + * tao/objkeyC.h: + * tao/object.h: + * tao/object.cpp: + Removed the non-complaint ObjectKey_ptr type. + Mon Jan 19 16:19:28 1998 Carlos O'Ryan <coryan@cs.wustl.edu> * tao/deep_free.cpp: diff --git a/TAO/tao/iiopobj.cpp b/TAO/tao/iiopobj.cpp index b757cbf8e07..d691b78d5b5 100644 --- a/TAO/tao/iiopobj.cpp +++ b/TAO/tao/iiopobj.cpp @@ -1,3 +1,4 @@ +// $Id$ // @ (#)iiopobj.cpp 1.9 95/11/04 // Copyright 1995 by Sun Microsystems Inc. @@ -326,6 +327,13 @@ IIOP_Object::QueryInterface (REFIID riid, return TAO_NOERROR; } +// TAO extensions +TAO::ObjectKey* +IIOP_Object::key (CORBA::Environment &) +{ + return new TAO::ObjectKey (this->profile.object_key); +} + // It will usually be used by the _bind call. // // Note that if the repository ID (typeID) is NULL, it will make diff --git a/TAO/tao/iiopobj.h b/TAO/tao/iiopobj.h index bd1a004f880..0e030f71a94 100644 --- a/TAO/tao/iiopobj.h +++ b/TAO/tao/iiopobj.h @@ -211,7 +211,7 @@ public: TAO_HRESULT QueryInterface (REFIID type_id, void **ppv); - virtual TAO::ObjectKey_ptr key (CORBA::Environment &env); + virtual TAO::ObjectKey* key (CORBA::Environment &); // Return the object key as an out parameter. Caller should release // return value when finished with it. diff --git a/TAO/tao/objkeyC.h b/TAO/tao/objkeyC.h index 56b931b4687..1f8923793ec 100644 --- a/TAO/tao/objkeyC.h +++ b/TAO/tao/objkeyC.h @@ -91,7 +91,6 @@ public: #endif // end #if !defined typedef _tao_seq_Octet ObjectKey; - typedef _tao_seq_Octet_ptr ObjectKey_ptr; typedef _tao_seq_Octet_var ObjectKey_var; typedef _tao_seq_Octet_out ObjectKey_out; |