diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2012-10-15 13:27:06 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2012-10-15 13:27:06 +0000 |
| commit | 987321ca7e11e9864578ee5b0cb9923096b836aa (patch) | |
| tree | d166e7292acb39be329867c382cd1ee0eab9a5a9 | |
| parent | ab3f2a2e8608150296505ca0eb9837f348cd2b75 (diff) | |
| download | ATCD-987321ca7e11e9864578ee5b0cb9923096b836aa.tar.gz | |
Mon Oct 15 13:26:27 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl>
* tao/Messaging/AMH_Response_Handler.h:
Use virtual inheritance
* tao/PortableServer/Root_POA.h:
Doxygen fix
| -rw-r--r-- | TAO/ChangeLog | 8 | ||||
| -rw-r--r-- | TAO/tao/Messaging/AMH_Response_Handler.h | 9 | ||||
| -rw-r--r-- | TAO/tao/PortableServer/Root_POA.h | 2 |
3 files changed, 10 insertions, 9 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index b6640717d52..85c3f4afea9 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,11 @@ +Mon Oct 15 13:26:27 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl> + + * tao/Messaging/AMH_Response_Handler.h: + Use virtual inheritance + + * tao/PortableServer/Root_POA.h: + Doxygen fix + Fri Oct 12 10:51:27 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl> * NEWS: diff --git a/TAO/tao/Messaging/AMH_Response_Handler.h b/TAO/tao/Messaging/AMH_Response_Handler.h index df4fd4b836c..12261a60cfa 100644 --- a/TAO/tao/Messaging/AMH_Response_Handler.h +++ b/TAO/tao/Messaging/AMH_Response_Handler.h @@ -64,14 +64,7 @@ typedef ACE_Allocator TAO_AMH_BUFFER_ALLOCATOR; * application. */ class TAO_Messaging_Export TAO_AMH_Response_Handler -// @@ Mayur, this is not the correct way to use -// TAO_LocalRefCounted_Object. Application code is supposed to use -// it when necessary. You're forcing applications to use a -// reference counted version of their AMH_Response_Handler. This -// isn't consistent with the specified semantics detailed in the -// CCM spec. Please remove this and place it where appropriate in -// your AMH tests and examples. - : public ::CORBA::LocalObject + : public virtual ::CORBA::LocalObject { public: diff --git a/TAO/tao/PortableServer/Root_POA.h b/TAO/tao/PortableServer/Root_POA.h index ee14f22a65d..44bf1cb9077 100644 --- a/TAO/tao/PortableServer/Root_POA.h +++ b/TAO/tao/PortableServer/Root_POA.h @@ -404,7 +404,7 @@ public: TAO::Portable_Server::POA_Current_Impl &poa_current_impl); /** - * Find the the servant with ObjectId <system_id>, and retrieve + * Find the the servant with ObjectId @a system_id, and retrieve * its priority. Usually used in RT CORBA with SERVER_DECLARED * priority model. * |