[Rel21] Stage 1 of updates for Rel21 Build System

This commit is contained in:
Antz 2015-07-28 10:59:34 +01:00 committed by Antz
parent 13292befd6
commit fdefc0869a
1951 changed files with 40474 additions and 252610 deletions

View file

@ -3,7 +3,7 @@
/**
* @file Condition_Recursive_Thread_Mutex.cpp
*
* $Id: Condition_Recursive_Thread_Mutex.cpp 96077 2012-08-20 08:13:23Z johnnyw $
* $Id: Condition_Recursive_Thread_Mutex.cpp 96985 2013-04-11 15:50:32Z huangh $
*
* Originally in Synch.cpp
*
@ -14,7 +14,7 @@
#if defined (ACE_HAS_THREADS)
#include "ace/Log_Msg.h"
#include "ace/Log_Category.h"
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
@ -30,12 +30,12 @@ ACE_Condition<ACE_Recursive_Thread_Mutex>::dump (void) const
#if defined (ACE_HAS_DUMP)
// ACE_TRACE ("ACE_Condition<MUTEX>::dump");
ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
// No dump method for ACE_cond_t even in emulated mode.
// cond_.dump ();
this->mutex_.dump ();
ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n")));
ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\n")));
ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
#endif /* ACE_HAS_DUMP */
}
@ -48,7 +48,7 @@ ACE_Condition<ACE_Recursive_Thread_Mutex>::ACE_Condition (ACE_Recursive_Thread_M
: mutex_ (m)
{
if (ACE_OS::cond_init (&this->cond_) != 0)
ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"),
ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"),
ACE_TEXT ("ACE_Condition<ACE_Recursive_Thread_Mutex>::ACE_Condition<ACE_Recursive_Thread_Mutex>")));
}
@ -58,7 +58,7 @@ ACE_Condition<ACE_Recursive_Thread_Mutex>::ACE_Condition (ACE_Recursive_Thread_M
{
if (ACE_OS::cond_init (&this->cond_,
const_cast<ACE_condattr_t &> (attributes.attributes ())) != 0)
ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"),
ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"),
ACE_TEXT ("ACE_Condition<ACE_Recursive_Thread_Mutex>::ACE_Condition<ACE_Recursive_Thread_Mutex>")));
}