summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1999-07-28 21:21:26 +0000
committernanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1999-07-28 21:21:26 +0000
commit9f415169aa32a2a3e4dc7013fd19aa57e094b3ea (patch)
tree762db68f0326a0bd846dc7736dcdc9a22b4e4074
parent647745bddfb616283d29ba9149d0c816b8921907 (diff)
downloadATCD-9f415169aa32a2a3e4dc7013fd19aa57e094b3ea.tar.gz
ChangeLogTag:Wed Jul 28 16:16:27 1999 Nanbor Wang <nanbor@cs.wustl.edu>
-rw-r--r--ace/OS.cpp14
1 files changed, 3 insertions, 11 deletions
diff --git a/ace/OS.cpp b/ace/OS.cpp
index f1dd9c50071..37ed06cecf6 100644
--- a/ace/OS.cpp
+++ b/ace/OS.cpp
@@ -248,7 +248,7 @@ void ACE_Time_Value::set (const FILETIME &file_time)
// Convert 100ns units to seconds;
this->tv_.tv_sec = long (_100ns.QuadPart / (10000 * 1000));
// Convert remainder to microseconds;
- this->tv_.tv_usec = long ((long (_100ns.QuadPart) % long (10000 * 1000)) / 10);
+ this->tv_.tv_usec = (long) ((_100ns.LowPart % (DWORD) (10000 * 1000)) / 10);
}
// Returns the value of the object as a Win32 FILETIME.
@@ -262,16 +262,8 @@ ACE_Time_Value::operator FILETIME () const
ACE_Time_Value::FILETIME_to_timval_skew);
FILETIME file_time;
-# if defined(__BORLANDC__)
-# define LOWPART(x) x.u.LowPart
-# define HIGHPART(x) x.u.HighPart
-# else
-# define LOWPART(x) x.LowPart
-# define HIGHPART(x) x.HighPart
-# endif /* defined(__BORLANDC__) */
-
- file_time.dwLowDateTime = LOWPART(_100ns);
- file_time.dwHighDateTime = HIGHPART(_100ns);
+ file_time.dwLowDateTime = _100ns.LowPart;
+ file_time.dwHighDateTime = _100ns.HighPart;
return file_time;
}