summaryrefslogtreecommitdiff
path: root/cpp/src/IceUtil/Time.cpp
diff options
context:
space:
mode:
authorMatthew Newhook <matthew@zeroc.com>2005-07-11 18:10:40 +0000
committerMatthew Newhook <matthew@zeroc.com>2005-07-11 18:10:40 +0000
commit5611579110ed0c87336894a0ad1ab6fdad149644 (patch)
treea75c3d6e99a2e0b92151ce3a61c3a5b19f221a98 /cpp/src/IceUtil/Time.cpp
parentAdded Ice.Warn.Endpoints (diff)
downloadice-5611579110ed0c87336894a0ad1ab6fdad149644.tar.bz2
ice-5611579110ed0c87336894a0ad1ab6fdad149644.tar.xz
ice-5611579110ed0c87336894a0ad1ab6fdad149644.zip
http://bugzilla.zeroc.com/bugzilla/show_bug.cgi?id=397
Diffstat (limited to 'cpp/src/IceUtil/Time.cpp')
-rw-r--r--cpp/src/IceUtil/Time.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/cpp/src/IceUtil/Time.cpp b/cpp/src/IceUtil/Time.cpp
index f62d7cfef01..ebd3f6a56e7 100644
--- a/cpp/src/IceUtil/Time.cpp
+++ b/cpp/src/IceUtil/Time.cpp
@@ -26,7 +26,7 @@ Time::Time() :
Time
IceUtil::Time::now()
{
-#ifdef WIN32
+#ifdef _WIN32
struct _timeb tb;
_ftime(&tb);
return Time(tb.time * static_cast<Int64>(1000000) + tb.millitm * static_cast<Int64>(1000));
@@ -55,6 +55,7 @@ IceUtil::Time::microSeconds(Int64 t)
return Time(t);
}
+#ifndef _WIN32
IceUtil::Time::operator timeval() const
{
timeval tv;
@@ -62,6 +63,7 @@ IceUtil::Time::operator timeval() const
tv.tv_usec = static_cast<long>(_usec % 1000000);
return tv;
}
+#endif
Int64
IceUtil::Time::toSeconds() const