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 /ACE/ace/OS_NS_time.h | |
| 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 'ACE/ace/OS_NS_time.h')
| -rw-r--r-- | ACE/ace/OS_NS_time.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ACE/ace/OS_NS_time.h b/ACE/ace/OS_NS_time.h index b2dde7c8981..aeb820f9585 100644 --- a/ACE/ace/OS_NS_time.h +++ b/ACE/ace/OS_NS_time.h @@ -133,12 +133,12 @@ inline DWORD ACE_HIGH_DWORD (ACE_QWORD q) { return (DWORD) (q >> 32); } # elif defined (_TNS_R_TARGET) typedef long long ACE_hrtime_t; # else /* !ACE_WIN32 */ -# if defined (ACE_HAS_HI_RES_TIMER) && !defined (ACE_LACKS_LONGLONG_T) +# if defined (ACE_HAS_HI_RES_TIMER) /* hrtime_t is defined on systems (Suns) with ACE_HAS_HI_RES_TIMER */ typedef hrtime_t ACE_hrtime_t; -# else /* ! ACE_HAS_HI_RES_TIMER || ACE_LACKS_LONGLONG_T */ +# else /* ! ACE_HAS_HI_RES_TIMER */ typedef ACE_UINT64 ACE_hrtime_t; -# endif /* ! ACE_HAS_HI_RES_TIMER || ACE_LACKS_LONGLONG_T */ +# endif /* ! ACE_HAS_HI_RES_TIMER */ # endif /* ACE_WIN32 */ # if defined (ACE_LACKS_UNSIGNEDLONGLONG_T) |