Remove useless whitespace, I need to setup msvc to disable all it's auto-indentation features which are terrible.
Originally committed to SVN as r4437.
This commit is contained in:
parent
1c3f6ed111
commit
1a7052040a
1 changed files with 10 additions and 10 deletions
|
@ -76,7 +76,7 @@ std::string ErrorString(DWORD error) {
|
||||||
/// @brief Get seconds and microseconds.
|
/// @brief Get seconds and microseconds.
|
||||||
/// @param tv[out] timeval struct
|
/// @param tv[out] timeval struct
|
||||||
/// This code is from http://www.suacommunity.com/dictionary/gettimeofday-entry.php
|
/// This code is from http://www.suacommunity.com/dictionary/gettimeofday-entry.php
|
||||||
void time_log(timeval &tv) {
|
void time_log(type::win::timeval &tv) {
|
||||||
#if defined(_MSC_VER) || defined(_MSC_EXTENSIONS)
|
#if defined(_MSC_VER) || defined(_MSC_EXTENSIONS)
|
||||||
#define DELTA_EPOCH_IN_MICROSECS 11644473600000000Ui64
|
#define DELTA_EPOCH_IN_MICROSECS 11644473600000000Ui64
|
||||||
#else
|
#else
|
||||||
|
@ -85,28 +85,28 @@ void time_log(timeval &tv) {
|
||||||
|
|
||||||
// Define a structure to receive the current Windows filetime
|
// Define a structure to receive the current Windows filetime
|
||||||
FILETIME ft;
|
FILETIME ft;
|
||||||
|
|
||||||
// Initialize the present time to 0 and the timezone to UTC
|
// Initialize the present time to 0 and the timezone to UTC
|
||||||
unsigned __int64 tmpres = 0;
|
unsigned __int64 tmpres = 0;
|
||||||
static int tzflag = 0;
|
static int tzflag = 0;
|
||||||
|
|
||||||
GetSystemTimeAsFileTime(&ft);
|
GetSystemTimeAsFileTime(&ft);
|
||||||
|
|
||||||
// The GetSystemTimeAsFileTime returns the number of 100 nanosecond
|
// The GetSystemTimeAsFileTime returns the number of 100 nanosecond
|
||||||
// intervals since Jan 1, 1601 in a structure. Copy the high bits to
|
// intervals since Jan 1, 1601 in a structure. Copy the high bits to
|
||||||
// the 64 bit tmpres, shift it left by 32 then or in the low 32 bits.
|
// the 64 bit tmpres, shift it left by 32 then or in the low 32 bits.
|
||||||
tmpres |= ft.dwHighDateTime;
|
tmpres |= ft.dwHighDateTime;
|
||||||
tmpres <<= 32;
|
tmpres <<= 32;
|
||||||
tmpres |= ft.dwLowDateTime;
|
tmpres |= ft.dwLowDateTime;
|
||||||
|
|
||||||
// Convert to microseconds by dividing by 10
|
// Convert to microseconds by dividing by 10
|
||||||
tmpres /= 10;
|
tmpres /= 10;
|
||||||
|
|
||||||
// The Unix epoch starts on Jan 1 1970. Need to subtract the difference
|
// The Unix epoch starts on Jan 1 1970. Need to subtract the difference
|
||||||
// in seconds from Jan 1 1601.
|
// in seconds from Jan 1 1601.
|
||||||
tmpres -= DELTA_EPOCH_IN_MICROSECS;
|
tmpres -= DELTA_EPOCH_IN_MICROSECS;
|
||||||
|
|
||||||
// Finally change microseconds to seconds and place in the seconds value.
|
// Finally change microseconds to seconds and place in the seconds value.
|
||||||
// The modulus picks up the microseconds.
|
// The modulus picks up the microseconds.
|
||||||
tv.tv_sec = (long)(tmpres / 1000000UL);
|
tv.tv_sec = (long)(tmpres / 1000000UL);
|
||||||
tv.tv_usec = (long)(tmpres % 1000000UL);
|
tv.tv_usec = (long)(tmpres % 1000000UL);
|
||||||
|
|
Loading…
Reference in a new issue