diff options
| author | jtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2005-01-28 15:56:34 +0000 |
|---|---|---|
| committer | jtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2005-01-28 15:56:34 +0000 |
| commit | a280fda6cbbc4c1688305d3b3108e89f2657f4b1 (patch) | |
| tree | ea3bf16505af6f1653b00cd354fcc1910e6db6df /TAO/orbsvcs/Fault_Detector | |
| parent | 8e2623740409f370574b2550fdaafd6ac2b74712 (diff) | |
| download | ATCD-a280fda6cbbc4c1688305d3b3108e89f2657f4b1.tar.gz | |
ChangeLogTag: Fri Jan 28 07:53:34 2005 J.T. Conklin <jtc@acorntoolworks.com>
Diffstat (limited to 'TAO/orbsvcs/Fault_Detector')
| -rw-r--r-- | TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.cpp | 6 | ||||
| -rw-r--r-- | TAO/orbsvcs/Fault_Detector/Fault_Detector_i.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.cpp b/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.cpp index b8013340481..979d3806a43 100644 --- a/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.cpp +++ b/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.cpp @@ -474,8 +474,8 @@ void TAO::FT_FaultDetectorFactory_i::change_properties ( { // note: these should be unsigned long, but // ACE_Time_Value wants longs. - long uSec = ACE_static_cast (long, (value / timeT_per_uSec) % uSec_per_sec); - long sec = ACE_static_cast (long, (value / timeT_per_uSec) / uSec_per_sec); + long uSec = static_cast<long> ((value / timeT_per_uSec) % uSec_per_sec); + long sec = static_cast<long> ((value / timeT_per_uSec) / uSec_per_sec); ACE_Time_Value atv(sec, uSec); TAO::Fault_Detector_i::set_time_for_all_detectors(atv); } @@ -601,7 +601,7 @@ CORBA::Object_ptr TAO::FT_FaultDetectorFactory_i::create_object ( } else { - object_type = ACE_const_cast (char *, "unknown"); + object_type = const_cast<char *> ("unknown"); // Not required: missingParameter = 1; ACE_DEBUG ((LM_DEBUG, "Object type not given.\n")); } diff --git a/TAO/orbsvcs/Fault_Detector/Fault_Detector_i.cpp b/TAO/orbsvcs/Fault_Detector/Fault_Detector_i.cpp index 0b9a7cbd3b2..bba77092823 100644 --- a/TAO/orbsvcs/Fault_Detector/Fault_Detector_i.cpp +++ b/TAO/orbsvcs/Fault_Detector/Fault_Detector_i.cpp @@ -196,7 +196,7 @@ void TAO::Fault_Detector_i::notify() //static ACE_THR_FUNC_RETURN TAO::Fault_Detector_i::thr_func (void * arg) { - TAO::Fault_Detector_i * detector = ACE_static_cast (TAO::Fault_Detector_i * , arg); + TAO::Fault_Detector_i * detector = static_cast<TAO::Fault_Detector_i * > (arg); detector->run (); return 0; } |