*Massive cleanup (\n\n -> \n, *\n -> \n, cleanup for(...) to for (...), and some other cleanups by hand)

*Fix a possible crash in Spell::DoAllEffectOnTarget

--HG--
branch : trunk
This commit is contained in:
maximius
2009-10-17 15:35:07 -07:00
parent f21f47005d
commit 26b5e033ff
2257 changed files with 750 additions and 103852 deletions
-19
View File
@@ -1,16 +1,13 @@
// -*- C++ -*-
//
// $Id: Semaphore.inl 80826 2008-03-04 14:51:23Z wotte $
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE const ACE_sema_t &
ACE_Semaphore::lock (void) const
{
// ACE_TRACE ("ACE_Semaphore::lock");
return this->semaphore_;
}
ACE_INLINE int
ACE_Semaphore::remove (void)
{
@@ -23,89 +20,74 @@ ACE_Semaphore::remove (void)
}
return result;
}
ACE_INLINE int
ACE_Semaphore::acquire (void)
{
// ACE_TRACE ("ACE_Semaphore::acquire");
return ACE_OS::sema_wait (&this->semaphore_);
}
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::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");
return ACE_OS::sema_trywait (&this->semaphore_);
}
ACE_INLINE int
ACE_Semaphore::release (void)
{
// ACE_TRACE ("ACE_Semaphore::release");
return ACE_OS::sema_post (&this->semaphore_);
}
ACE_INLINE int
ACE_Semaphore::release (unsigned int release_count)
{
// ACE_TRACE ("ACE_Semaphore::release");
return ACE_OS::sema_post (&this->semaphore_, release_count);
}
// Acquire semaphore ownership. This calls <acquire> and is only
// here to make the <ACE_Semaphore> interface consistent with the
// other synchronization APIs.
ACE_INLINE int
ACE_Semaphore::acquire_read (void)
{
return this->acquire ();
}
// Acquire semaphore ownership. This calls <acquire> and is only
// here to make the <ACE_Semaphore> interface consistent with the
// other synchronization APIs.
ACE_INLINE int
ACE_Semaphore::acquire_write (void)
{
return this->acquire ();
}
// Conditionally acquire semaphore (i.e., won't block). This calls
// <tryacquire> and is only here to make the <ACE_Semaphore>
// interface consistent with the other synchronization APIs.
ACE_INLINE int
ACE_Semaphore::tryacquire_read (void)
{
return this->tryacquire ();
}
// Conditionally acquire semaphore (i.e., won't block). This calls
// <tryacquire> and is only here to make the <ACE_Semaphore>
// interface consistent with the other synchronization APIs.
ACE_INLINE int
ACE_Semaphore::tryacquire_write (void)
{
return this->tryacquire ();
}
// This is only here to make the <ACE_Semaphore> interface consistent
// with the other synchronization APIs. Assumes the caller has
// already acquired the semaphore using one of the above calls, and
@@ -115,5 +97,4 @@ ACE_Semaphore::tryacquire_write_upgrade (void)
{
return 0;
}
ACE_END_VERSIONED_NAMESPACE_DECL