diff options
| author | maximius <none@none> | 2009-10-17 15:35:07 -0700 |
|---|---|---|
| committer | maximius <none@none> | 2009-10-17 15:35:07 -0700 |
| commit | 26b5e033ffde3d161382fc9addbfa99738379641 (patch) | |
| tree | a344f369ca32945f787a02dee35c3dbe342bed7e /dep/ACE_wrappers/ace/gethrtime.cpp | |
| parent | f21f47005dcb6b76e1abc9f35fbcd03eed191bff (diff) | |
*Massive cleanup (\n\n -> \n, *\n -> \n, cleanup for(...) to for (...), and some other cleanups by hand)
*Fix a possible crash in Spell::DoAllEffectOnTarget
--HG--
branch : trunk
Diffstat (limited to 'dep/ACE_wrappers/ace/gethrtime.cpp')
| -rw-r--r-- | dep/ACE_wrappers/ace/gethrtime.cpp | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/dep/ACE_wrappers/ace/gethrtime.cpp b/dep/ACE_wrappers/ace/gethrtime.cpp index 163645cd68b..360db7a78a3 100644 --- a/dep/ACE_wrappers/ace/gethrtime.cpp +++ b/dep/ACE_wrappers/ace/gethrtime.cpp @@ -4,28 +4,21 @@ // that was compiled with GreenHills. It wouldn't be necessary if I // knew a way to correctly move values from registers to a 64-bit // variable in GHS asm code. That's easy with g++ asm. - #include "ace/config-all.h" - ACE_RCSID(ace, gethrtime, "$Id: gethrtime.cpp 80826 2008-03-04 14:51:23Z wotte $") - #if defined (ghs) && (defined (i386) || defined(__i386__)) - #include "ace/OS_NS_time.h" - extern "C" ACE_hrtime_t ACE_GETHRTIME_NAME (void) { #if defined (ACE_HAS_PENTIUM) // ACE_TRACE ("ACE_GETHRTIME_NAME"); - #if defined (ACE_LACKS_LONGLONG_T) double now; #else /* ! ACE_LACKS_LONGLONG_T */ ACE_hrtime_t now; #endif /* ! ACE_LACKS_LONGLONG_T */ - // Read the high-res tick counter directly into memory variable // "now". The A constraint signifies a 64-bit int. #if defined (__GNUG__) @@ -38,7 +31,6 @@ ACE_GETHRTIME_NAME (void) #else # error unsupported compiler #endif - #if defined (ACE_LACKS_LONGLONG_T) // ACE_U_LongLong doesn't have the same layout as now, so construct // it "properly". @@ -46,13 +38,11 @@ ACE_GETHRTIME_NAME (void) ACE_OS::memcpy (&least, &now, sizeof (ACE_UINT32)); ACE_OS::memcpy (&most, (unsigned char *) &now + sizeof (ACE_UINT32), sizeof (ACE_UINT32)); - const ACE_hrtime_t ret (least, most); return ret; #else /* ! ACE_LACKS_LONGLONG_T */ return now; #endif /* ! ACE_LACKS_LONGLONG_T */ - #else /* ! ACE_HAS_PENTIUM */ # error This file can _only_ be compiled with ACE_HAS_PENTIUM. #endif /* ! ACE_HAS_PENTIUM */ |