diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2020-12-29 09:16:03 +0100 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2020-12-29 09:16:03 +0100 |
| commit | 1d1caa2f5340920a93898f9e34cd1c5477400320 (patch) | |
| tree | e15c34bf9476ee1687965b1eccd78bc316223813 /TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp | |
| parent | 76c3b5473a9d0aa75e8f36522eff1a1307f89cf2 (diff) | |
| parent | daabeb9bb2388926f610f93c987563ce596e091f (diff) | |
| download | ATCD-1d1caa2f5340920a93898f9e34cd1c5477400320.tar.gz | |
Merge branch 'master' into test-corba-is-nil
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp')
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp index e4ab0334684..2e87871cfb0 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp @@ -19,7 +19,7 @@ TAO_FT_Service_Callbacks::TAO_FT_Service_Callbacks (TAO_ORB_Core *) { } -TAO_FT_Service_Callbacks::~TAO_FT_Service_Callbacks (void) +TAO_FT_Service_Callbacks::~TAO_FT_Service_Callbacks () { } @@ -325,7 +325,7 @@ TAO_FT_Service_Callbacks::restart_policy_check ( } TimeBase::TimeT -TAO_FT_Service_Callbacks::now (void) +TAO_FT_Service_Callbacks::now () { // Grab the localtime on the machine where this is running ACE_Time_Value time_val = ACE_OS::gettimeofday (); |