ChangeLogTag:Mon Jul 30 05:43:23 2001 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu>

1 files changed, 39 insertions, 2 deletions

diff --git a/ace/Synch.i b/ace/Synch.i
index 645daf57514..4d6550a6e8d 100644
--- a/ace/Synch.i
+++ b/ace/Synch.i
@@ -172,6 +172,13 @@ ACE_Mutex::acquire (ACE_Time_Value &tv)
 }
 
 ACE_INLINE int
+ACE_Mutex::acquire (ACE_Time_Value *tv)
+{
+  // ACE_TRACE ("ACE_Mutex::acquire");
+  return ACE_OS::mutex_lock (&this->lock_, tv);
+}
+
+ACE_INLINE int
 ACE_Mutex::tryacquire (void)
 {
 // ACE_TRACE ("ACE_Mutex::tryacquire");
@@ -277,6 +284,13 @@ ACE_Semaphore::acquire (ACE_Time_Value &tv)
 }
 
 ACE_INLINE int
+ACE_Semaphore::acquire (ACE_Time_Value *tv)
+{
+// ACE_TRACE ("ACE_Semaphore::acquire");
+  return ACE_OS::sema_wait (&this->semaphore_, tv);
+}
+
+ACE_INLINE int
 ACE_Semaphore::tryacquire (void)
 {
 // ACE_TRACE ("ACE_Semaphore::tryacquire");
@@ -372,7 +386,15 @@ ACE_Null_Semaphore::remove (void)
 ACE_INLINE int
 ACE_Null_Semaphore::acquire (ACE_Time_Value &)
 {
-  return 0;
+  errno = ETIME;
+  return -1;
+}
+
+ACE_INLINE int
+ACE_Null_Semaphore::acquire (ACE_Time_Value *)
+{
+  errno = ETIME;
+  return -1;
 }
 
 ACE_INLINE int
@@ -493,6 +515,13 @@ ACE_Thread_Mutex::acquire (ACE_Time_Value &tv)
 }
 
 ACE_INLINE int
+ACE_Thread_Mutex::acquire (ACE_Time_Value *tv)
+{
+  // ACE_TRACE ("ACE_Thread_Mutex::acquire");
+  return ACE_OS::thread_mutex_lock (&this->lock_, tv);
+}
+
+ACE_INLINE int
 ACE_Thread_Mutex::tryacquire (void)
 {
 // ACE_TRACE ("ACE_Thread_Mutex::tryacquire");
@@ -731,7 +760,15 @@ ACE_Null_Mutex::acquire (void)
 ACE_INLINE int
 ACE_Null_Mutex::acquire (ACE_Time_Value &)
 {
-  return 0;
+  errno = ETIME;
+  return -1;
+}
+
+ACE_INLINE int
+ACE_Null_Mutex::acquire (ACE_Time_Value *)
+{
+  errno = ETIME;
+  return -1;
 }
 
 ACE_INLINE int