diff options
| author | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2004-02-06 21:05:24 +0000 |
|---|---|---|
| committer | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2004-02-06 21:05:24 +0000 |
| commit | f2b7603b3337c66a848b46b9c3e147c1fe3d57bb (patch) | |
| tree | 50ab44d9a6e43aaab29a7d2c0fa6ad8b8a767616 | |
| parent | 6c88b4d860ba117c27e1cb8880676b5d29b181d8 (diff) | |
| download | ATCD-f2b7603b3337c66a848b46b9c3e147c1fe3d57bb.tar.gz | |
ChangeLogTag: Fri Feb 6 14:59:45 2004 Jeff Parsons <j.parsons@vanderbilt.edu>
| -rw-r--r-- | TAO/ChangeLog | 9 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/IFRService/ExtAbstractInterfaceDef_i.cpp | 14 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/IFRService/ExtAbstractInterfaceDef_i.h | 5 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/IFRService/ExtLocalInterfaceDef_i.cpp | 14 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/IFRService/ExtLocalInterfaceDef_i.h | 5 |
5 files changed, 47 insertions, 0 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 84f9e566a29..4fef8ac1222 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,12 @@ +Fri Feb 6 14:59:45 2004 Jeff Parsons <j.parsons@vanderbilt.edu> + + * orbsvcs/orbsvcs/IFRService/ExtAbstactInterfaceDef_i.cpp: + * orbsvcs/orbsvcs/IFRService/ExtAbstactInterfaceDef_i.h: + * orbsvcs/orbsvcs/IFRService/ExtLocalInterfaceDef_i.cpp: + * orbsvcs/orbsvcs/IFRService/ExtLocalInterfaceDef_i.h: + + Added destroy() method to disambiguate multiple inheritance. + Fri Feb 6 10:48:07 2004 Balachandran Natarajan <bala@dre.vanderbilt.edu> * performance-tests/Sequence_Latency/Thread_Per_Connection/Roundtrip.cpp: diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExtAbstractInterfaceDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ExtAbstractInterfaceDef_i.cpp index ad535c02f9e..16b2c30b1b9 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ExtAbstractInterfaceDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtAbstractInterfaceDef_i.cpp @@ -25,3 +25,17 @@ TAO_ExtAbstractInterfaceDef_i::~TAO_ExtAbstractInterfaceDef_i (void) { } +// Just call the base class version, this is here only to +// disambiguate multiple inheritance. +void +TAO_ExtAbstractInterfaceDef_i::destroy (ACE_ENV_SINGLE_ARG_DECL) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + TAO_IFR_WRITE_GUARD; + + this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_CHECK; + + TAO_AbstractInterfaceDef_i::destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER); +} + diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExtAbstractInterfaceDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ExtAbstractInterfaceDef_i.h index e48ca3dbf2e..24328742cd8 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ExtAbstractInterfaceDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtAbstractInterfaceDef_i.h @@ -52,6 +52,11 @@ public: virtual ~TAO_ExtAbstractInterfaceDef_i (void); // Destructor + + virtual void destroy ( + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) + ACE_THROW_SPEC ((CORBA::SystemException)); }; #if defined(_MSC_VER) && (_MSC_VER >= 1200) diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExtLocalInterfaceDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ExtLocalInterfaceDef_i.cpp index d507a7e7915..ea0ea0e3c41 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ExtLocalInterfaceDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtLocalInterfaceDef_i.cpp @@ -25,3 +25,17 @@ TAO_ExtLocalInterfaceDef_i::~TAO_ExtLocalInterfaceDef_i (void) { } +// Just call the base class version, this is here only to +// disambiguate multiple inheritance. +void +TAO_ExtLocalInterfaceDef_i::destroy (ACE_ENV_SINGLE_ARG_DECL) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + TAO_IFR_WRITE_GUARD; + + this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_CHECK; + + TAO_LocalInterfaceDef_i::destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER); +} + diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExtLocalInterfaceDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ExtLocalInterfaceDef_i.h index 846b5e6d515..cb4b7769661 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ExtLocalInterfaceDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtLocalInterfaceDef_i.h @@ -52,6 +52,11 @@ public: virtual ~TAO_ExtLocalInterfaceDef_i (void); // Destructor + + virtual void destroy ( + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ) + ACE_THROW_SPEC ((CORBA::SystemException)); }; #if defined(_MSC_VER) && (_MSC_VER >= 1200) |