summaryrefslogtreecommitdiff
path: root/ace/SV_Semaphore_Complex.inl
diff options
context:
space:
mode:
Diffstat (limited to 'ace/SV_Semaphore_Complex.inl')
-rw-r--r--ace/SV_Semaphore_Complex.inl23
1 files changed, 9 insertions, 14 deletions
diff --git a/ace/SV_Semaphore_Complex.inl b/ace/SV_Semaphore_Complex.inl
index 8b80748ebf5..00c3450c1bd 100644
--- a/ace/SV_Semaphore_Complex.inl
+++ b/ace/SV_Semaphore_Complex.inl
@@ -1,60 +1,57 @@
-// -*- C++ -*-
-//
+/* -*- C++ -*- */
// $Id$
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
ACE_INLINE int
-ACE_SV_Semaphore_Complex::acquire (u_short n, short flags) const
+ACE_SV_Semaphore_Complex::acquire (u_short n, int flags) const
{
ACE_TRACE ("ACE_SV_Semaphore_Complex::acquire");
return ACE_SV_Semaphore_Simple::acquire ((u_short) n + 2, flags);
}
ACE_INLINE int
-ACE_SV_Semaphore_Complex::acquire_read (u_short n, short flags) const
+ACE_SV_Semaphore_Complex::acquire_read (u_short n, int flags) const
{
ACE_TRACE ("ACE_SV_Semaphore_Complex::acquire_read");
return this->acquire (n, flags);
}
ACE_INLINE int
-ACE_SV_Semaphore_Complex::acquire_write (u_short n, short flags) const
+ACE_SV_Semaphore_Complex::acquire_write (u_short n, int flags) const
{
ACE_TRACE ("ACE_SV_Semaphore_Complex::acquire_write");
return this->acquire (n, flags);
}
ACE_INLINE int
-ACE_SV_Semaphore_Complex::tryacquire (u_short n, short flags) const
+ACE_SV_Semaphore_Complex::tryacquire (u_short n, int flags) const
{
ACE_TRACE ("ACE_SV_Semaphore_Complex::tryacquire");
return ACE_SV_Semaphore_Simple::tryacquire ((u_short) n + 2, flags);
}
ACE_INLINE int
-ACE_SV_Semaphore_Complex::tryacquire_read (u_short n, short flags) const
+ACE_SV_Semaphore_Complex::tryacquire_read (u_short n, int flags) const
{
ACE_TRACE ("ACE_SV_Semaphore_Complex::tryacquire_read");
return this->tryacquire (n, flags);
}
ACE_INLINE int
-ACE_SV_Semaphore_Complex::tryacquire_write (u_short n, short flags) const
+ACE_SV_Semaphore_Complex::tryacquire_write (u_short n, int flags) const
{
ACE_TRACE ("ACE_SV_Semaphore_Complex::tryacquire_write");
return this->tryacquire (n, flags);
}
ACE_INLINE int
-ACE_SV_Semaphore_Complex::release (u_short n, short flags) const
+ACE_SV_Semaphore_Complex::release (u_short n, int flags) const
{
ACE_TRACE ("ACE_SV_Semaphore_Complex::release");
return ACE_SV_Semaphore_Simple::release ((u_short) n + 2, flags);
}
ACE_INLINE int
-ACE_SV_Semaphore_Complex::op (short val, u_short n, short flags) const
+ACE_SV_Semaphore_Complex::op (int val, u_short n, int flags) const
{
ACE_TRACE ("ACE_SV_Semaphore_Complex::op");
return ACE_SV_Semaphore_Simple::op (val, (u_short) n + 2, flags);
@@ -80,5 +77,3 @@ ACE_SV_Semaphore_Complex::control (int cmd, int value, u_short n) const
ACE_TRACE ("ACE_SV_Semaphore_Complex::control");
return ACE_SV_Semaphore_Simple::control (cmd, value, (u_short) n + 2);
}
-
-ACE_END_VERSIONED_NAMESPACE_DECL