diff options
| author | bala <balanatarajan@users.noreply.github.com> | 2000-10-10 19:07:38 +0000 |
|---|---|---|
| committer | bala <balanatarajan@users.noreply.github.com> | 2000-10-10 19:07:38 +0000 |
| commit | f8c9ac9b7314df778b9e4939398ba9f049029039 (patch) | |
| tree | 2171937068a7221010dc436ebf6012d6be53e506 | |
| parent | 572f6ba54617ffd206b8661b6ecdac6911c31296 (diff) | |
| download | ATCD-f8c9ac9b7314df778b9e4939398ba9f049029039.tar.gz | |
ChangeLogTag: Tue Oct 10 14:05:34 2000 Balachandran Natarajan <bala@cs.wustl.edu>
| -rw-r--r-- | TAO/ChangeLogs/ChangeLog-02a | 9 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.cpp | 21 | ||||
| -rw-r--r-- | TAO/tao/Fault_Tolerance_Service.h | 5 | ||||
| -rw-r--r-- | TAO/tao/Fault_Tolerance_Service.i | 8 |
4 files changed, 31 insertions, 12 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index 83eb0dc02e5..e45f8782a2e 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,9 +1,16 @@ +Tue Oct 10 14:05:34 2000 Balachandran Natarajan <bala@cs.wustl.edu> + + * tao/Fault_Tolerance_Service.h: + * tao/Fault_Tolerance_Service.i: + * orbsvcs/orbsvcs/Fault_Tolerance/FT_Policy_i.cpp: Fixed link + errors on Guajira. They should be hopefully be fixed. + Tue Oct 10 13:11:09 2000 Angelo Corsaro <corsaro@cs.wustl.edu> * orbsvcs/orbsvcs/Fault_Tolerance.dsp: * tests/Object_Loader/driver.dsp: - Made some other project setting to fix lining errors. + Made some other project setting to fix linking errors. * tao/PortableServer/Makefile.bor: diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.cpp index 9366551e762..df0dfc449fc 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.cpp @@ -148,6 +148,16 @@ TAO_FT_Heart_Beat_Policy::copy (CORBA_Environment &ACE_TRY_ENV) return tmp; } +TAO_FT_Heart_Beat_Policy * +TAO_FT_Heart_Beat_Policy::clone (void) const +{ + TAO_FT_Heart_Beat_Policy *copy = 0; + ACE_NEW_RETURN (copy, + TAO_FT_Heart_Beat_Policy (*this), + 0); + return copy; +} + void TAO_FT_Heart_Beat_Policy::destroy (CORBA_Environment &) ACE_THROW_SPEC ((CORBA::SystemException)) @@ -226,6 +236,17 @@ TAO_FT_Heart_Beat_Enabled_Policy::copy (CORBA_Environment &ACE_TRY_ENV) return tmp; } +TAO_FT_Heart_Beat_Enabled_Policy * +TAO_FT_Heart_Beat_Enabled_Policy::clone (void) const +{ + TAO_FT_Heart_Beat_Enabled_Policy *copy = 0; + ACE_NEW_RETURN (copy, + TAO_FT_Heart_Beat_Enabled_Policy (*this), + 0); + return copy; +} + + void TAO_FT_Heart_Beat_Enabled_Policy::destroy (CORBA_Environment &) ACE_THROW_SPEC ((CORBA::SystemException)) diff --git a/TAO/tao/Fault_Tolerance_Service.h b/TAO/tao/Fault_Tolerance_Service.h index bcf746cbc03..6a489b6c8fc 100644 --- a/TAO/tao/Fault_Tolerance_Service.h +++ b/TAO/tao/Fault_Tolerance_Service.h @@ -73,11 +73,8 @@ public: void client_id (const char *id); // Set the client id - CORBA::Long new_retention_id (void); - // Generate and return a new retention id - CORBA::Long retention_id (void); - // Return the underlying the retention id + // Generate and return a new retention id private: diff --git a/TAO/tao/Fault_Tolerance_Service.i b/TAO/tao/Fault_Tolerance_Service.i index 9bb42aa1c93..5ae2e09be34 100644 --- a/TAO/tao/Fault_Tolerance_Service.i +++ b/TAO/tao/Fault_Tolerance_Service.i @@ -29,7 +29,7 @@ TAO_Fault_Tolerance_Service::client_id (const char *id) } ACE_INLINE CORBA::Long -TAO_Fault_Tolerance_Service::new_retention_id (void) +TAO_Fault_Tolerance_Service::retention_id (void) { ACE_MT (ACE_GUARD_RETURN (ACE_Lock, guard, @@ -38,9 +38,3 @@ TAO_Fault_Tolerance_Service::new_retention_id (void) return ++this->ft_object_retention_id_; } - -ACE_INLINE CORBA::Long -TAO_Fault_Tolerance_Service::retention_id (void) -{ - return this->ft_object_retention_id_; -} |