diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2012-05-15 18:23:04 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2012-05-15 18:23:04 +0000 |
| commit | 38d791f18d8a67b8b9319f4b6a9579101628b28c (patch) | |
| tree | be35c69512246f58a303abc27e2028a848a78f8a /TAO/orbsvcs/tests/Notify/lib/Task_Stats.inl | |
| parent | 7d6ea0dc00c882c452db06f31af9acc17fc18046 (diff) | |
| download | ATCD-38d791f18d8a67b8b9319f4b6a9579101628b28c.tar.gz | |
Tue May 15 18:16:09 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl>
* ace/ACE.inl:
* ace/Atomic_Op_T.h:
* ace/Basic_Types.h:
* ace/Basic_Types.inl:
* ace/Basic_Types.cpp:
* ace/CDR_Base.h:
* ace/Functor.h:
* ace/Functor.inl:
* ace/Handle_Set.cpp:
* ace/High_Res_Timer.cpp:
* ace/Log_Msg.cpp:
* ace/Numeric_Limits.h:
* ace/OS_NS_Thread.inl:
* ace/OS_NS_Thread.cpp:
* ace/OS_NS_stdlib.inl:
* ace/OS_NS_sys_select.inl:
* ace/OS_NS_sys_wait.inl:
* ace/OS_NS_time.h:
* ace/OS_NS_time.inl:
* ace/OS_NS_unistd.inl:
* ace/Profile_Timer.cpp:
* ace/Sched_Params.cpp:
* ace/Stats.cpp:
* ace/Task.cpp:
* ace/Throughput_Stats.cpp:
* ace/Time_Value.h:
* ace/Time_Value.inl:
* ace/Truncate.h:
* ace/UUID.cpp:
* ace/os_include/os_pthread.h:
* performance-tests/Server_Concurrency/Latency_Stats.h:
* performance-tests/Server_Concurrency/Leader_Follower/leader_follower.cpp:
* performance-tests/Server_Concurrency/Queue_Based_Workers/workers.cpp:
* performance-tests/UDP/udp_test.cpp:
* tests/Atomic_Op_Test.cpp:
* tests/Basic_Types_Test.cpp:
* tests/CDR_Array_Test.cpp:
Removed support for Tandem NSK. That was the last platform that
needed the emulated versions of ACE_INT64 and ACE_UINT64, that
emulation has now been removed
* ace/config-tandem-nsk-mips-v2.h:
* ace/config-tandem-nsk-mips-v3.h:
Removed these files.
Diffstat (limited to 'TAO/orbsvcs/tests/Notify/lib/Task_Stats.inl')
| -rw-r--r-- | TAO/orbsvcs/tests/Notify/lib/Task_Stats.inl | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/TAO/orbsvcs/tests/Notify/lib/Task_Stats.inl b/TAO/orbsvcs/tests/Notify/lib/Task_Stats.inl index aed41117a3d..ba9526204cd 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Task_Stats.inl +++ b/TAO/orbsvcs/tests/Notify/lib/Task_Stats.inl @@ -7,11 +7,7 @@ ACE_INLINE double Task_Stats::diff_sec (ACE_UINT64 before, ACE_UINT64 after) { double seconds = -#if defined ACE_LACKS_LONGLONG_T - (after - before) / gsf_; -#else /* ! ACE_LACKS_LONGLONG_T */ - static_cast<double> (ACE_UINT64_DBLCAST_ADAPTER((after - before) / gsf_)); -#endif /* ! ACE_LACKS_LONGLONG_T */ + static_cast<double> (ACE_UINT64_DBLCAST_ADAPTER((after - before) / gsf_)); seconds /= ACE_HR_SCALE_CONVERSION; return seconds; @@ -21,13 +17,7 @@ ACE_INLINE ACE_UINT32 Task_Stats::diff_usec (ACE_UINT64 before, ACE_UINT64 after) { // convert to microseconds - #if !defined ACE_LACKS_LONGLONG_T ACE_UINT32 elapsed_microseconds = ACE_UINT32((after - before) / gsf_); - #else /* ! ACE_LACKS_LONGLONG_T */ - - ACE_UINT32 elapsed_microseconds = (after - before) / gsf_; - - #endif /* ! ACE_LACKS_LONGLONG_T */ #if defined (ACE_WIN32) elapsed_microseconds*=1000; // convert to uSec on Win32 |