diff options
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/include/IceUtil/Cond.h | 4 | ||||
| -rw-r--r-- | cpp/include/IceUtil/Time.h | 1 | ||||
| -rw-r--r-- | cpp/src/IceUtil/Time.cpp | 4 | ||||
| -rw-r--r-- | cpp/src/IceUtil/iceutil.dsp | 8 |
4 files changed, 12 insertions, 5 deletions
diff --git a/cpp/include/IceUtil/Cond.h b/cpp/include/IceUtil/Cond.h index 24c1b36f26c..20a22f2d522 100644 --- a/cpp/include/IceUtil/Cond.h +++ b/cpp/include/IceUtil/Cond.h @@ -48,7 +48,7 @@ public: ~Semaphore(); void wait() const; - bool timedWait(long = -1) const; + bool timedWait(const Time&) const; void post(int = 1) const; private: @@ -183,7 +183,7 @@ private: try { - dowait(-1); + dowait(); mutex.lock(state); } catch(...) diff --git a/cpp/include/IceUtil/Time.h b/cpp/include/IceUtil/Time.h index e42f010bb26..d4b4a071c90 100644 --- a/cpp/include/IceUtil/Time.h +++ b/cpp/include/IceUtil/Time.h @@ -60,7 +60,6 @@ public: // Implicit conversion to a timeval & timespec. // operator timeval() const; - operator timespec() const; private: diff --git a/cpp/src/IceUtil/Time.cpp b/cpp/src/IceUtil/Time.cpp index d808796a6d7..4c0e0c12dfe 100644 --- a/cpp/src/IceUtil/Time.cpp +++ b/cpp/src/IceUtil/Time.cpp @@ -142,8 +142,8 @@ IceUtil::Time::operator!=(const Time& other) const IceUtil::Time::operator timeval() const { timeval tv; - tv.tv_sec = _usec / 1000000; - tv.tv_usec = _usec % 1000000; + tv.tv_sec = (long)(_usec / 1000000); + tv.tv_usec = (long)(_usec % 1000000); return tv; } diff --git a/cpp/src/IceUtil/iceutil.dsp b/cpp/src/IceUtil/iceutil.dsp index 4fd833685fd..b4893d0a1ca 100644 --- a/cpp/src/IceUtil/iceutil.dsp +++ b/cpp/src/IceUtil/iceutil.dsp @@ -132,6 +132,10 @@ SOURCE=.\Thread.cpp # End Source File
# Begin Source File
+SOURCE=.\Time.cpp
+# End Source File
+# Begin Source File
+
SOURCE=.\Unicode.cpp
# End Source File
# Begin Source File
@@ -204,6 +208,10 @@ SOURCE=..\..\include\IceUtil\Thread.h # End Source File
# Begin Source File
+SOURCE=..\..\include\IceUtil\Time.h
+# End Source File
+# Begin Source File
+
SOURCE=..\..\include\IceUtil\Unicode.h
# End Source File
# Begin Source File
|