diff options
| author | Michi Henning <michi@zeroc.com> | 2005-11-18 22:59:46 +0000 |
|---|---|---|
| committer | Michi Henning <michi@zeroc.com> | 2005-11-18 22:59:46 +0000 |
| commit | 1995b4af86f8edbb2f12405d05bce2b6e47459b1 (patch) | |
| tree | fa5813ff5b05ea5f8d316515b394ee520aacd288 /cpp/src/IceUtil/Time.cpp | |
| parent | Added note about iceboxd (diff) | |
| download | ice-1995b4af86f8edbb2f12405d05bce2b6e47459b1.tar.bz2 ice-1995b4af86f8edbb2f12405d05bce2b6e47459b1.tar.xz ice-1995b4af86f8edbb2f12405d05bce2b6e47459b1.zip | |
Moved VS 8 warning suppression into IceUtil/DisableWarnings.h
Diffstat (limited to 'cpp/src/IceUtil/Time.cpp')
| -rw-r--r-- | cpp/src/IceUtil/Time.cpp | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/cpp/src/IceUtil/Time.cpp b/cpp/src/IceUtil/Time.cpp index b6ba14ca2e1..aa0f5a3fa85 100644 --- a/cpp/src/IceUtil/Time.cpp +++ b/cpp/src/IceUtil/Time.cpp @@ -7,6 +7,7 @@ // // ********************************************************************** +#include <IceUtil/DisableWarnings.h> #include <IceUtil/Time.h> #ifdef _WIN32 @@ -28,11 +29,7 @@ IceUtil::Time::now() { #ifdef _WIN32 struct _timeb tb; -# if _MSC_VER >= 1400 - _ftime_s(&tb); -# else _ftime(&tb); -# endif return Time(static_cast<Int64>(tb.time) * ICE_INT64(1000000) + tb.millitm * 1000); #else @@ -113,13 +110,7 @@ IceUtil::Time::toString() const struct tm* t; #ifdef _WIN32 -# if _MSC_VER >= 1400 - struct tm tms; - t = &tms; - localtime_s(t, &time); -# else t = localtime(&time); -# endif #else struct tm tr; localtime_r(&time, &tr); |