Core/Dependencies: Update ACE to v6.1.4 (Windows only)

Tested in multiple configurations
.diff with TC changes added
This commit is contained in:
Nay
2012-09-17 23:21:01 +01:00
parent 6ebc6b9a76
commit 2e21fa6b92
549 changed files with 28949 additions and 14408 deletions
+18 -1
View File
@@ -1,6 +1,6 @@
// -*- C++ -*-
//
// $Id: Atomic_Op_T.inl 91688 2010-09-09 11:21:50Z johnnyw $
// $Id: Atomic_Op_T.inl 95225 2011-12-05 20:25:15Z shuston $
#include "ace/Guard_T.h"
@@ -152,6 +152,16 @@ ACE_Atomic_Op_Ex<ACE_LOCK, TYPE>::operator= (
return *this;
}
template <class ACE_LOCK, class TYPE>
ACE_INLINE TYPE
ACE_Atomic_Op_Ex<ACE_LOCK, TYPE>::exchange (TYPE newval)
{
// ACE_TRACE ("ACE_Atomic_Op_Ex<ACE_LOCK, TYPE>::exchange");
ACE_GUARD_RETURN (ACE_LOCK, ace_mon, this->mutex_, this->value_);
std::swap (this->value_, newval);
return newval;
}
template <class ACE_LOCK, class TYPE>
ACE_INLINE TYPE
ACE_Atomic_Op_Ex<ACE_LOCK, TYPE>::value (void) const
@@ -306,6 +316,13 @@ ACE_Atomic_Op<ACE_LOCK, TYPE>::operator< (
return this->impl_ < rhs;
}
template <class ACE_LOCK, class TYPE>
ACE_INLINE TYPE
ACE_Atomic_Op<ACE_LOCK, TYPE>::exchange (TYPE newval)
{
return this->impl_.exchange (newval);
}
template <class ACE_LOCK, class TYPE>
ACE_INLINE TYPE
ACE_Atomic_Op<ACE_LOCK, TYPE>::value (void) const