mirror of
https://github.com/mangosfour/server.git
synced 2025-12-13 04:37:00 +00:00
[Rel21] Stage 1 of updates for Rel21 Build System
This commit is contained in:
parent
13292befd6
commit
fdefc0869a
1951 changed files with 40474 additions and 252610 deletions
|
|
@ -1,4 +1,4 @@
|
|||
// $Id: Framework_Component.cpp 92208 2010-10-13 06:20:39Z johnnyw $
|
||||
// $Id: Framework_Component.cpp 96985 2013-04-11 15:50:32Z huangh $
|
||||
|
||||
#include "ace/Framework_Component.h"
|
||||
|
||||
|
|
@ -7,7 +7,7 @@
|
|||
#endif /* __ACE_INLINE__ */
|
||||
|
||||
#include "ace/Object_Manager.h"
|
||||
#include "ace/Log_Msg.h"
|
||||
#include "ace/Log_Category.h"
|
||||
#include "ace/DLL_Manager.h"
|
||||
#include "ace/Recursive_Thread_Mutex.h"
|
||||
#include "ace/OS_NS_string.h"
|
||||
|
|
@ -133,7 +133,7 @@ ACE_Framework_Repository::register_component (ACE_Framework_Component *fc)
|
|||
if (this->component_vector_[i] &&
|
||||
fc->this_ == this->component_vector_[i]->this_)
|
||||
{
|
||||
ACE_ERROR_RETURN ((LM_ERROR,
|
||||
ACELIB_ERROR_RETURN ((LM_ERROR,
|
||||
"AFR::register_component: error, compenent already registered\n"),
|
||||
-1);
|
||||
}
|
||||
|
|
@ -193,7 +193,7 @@ ACE_Framework_Repository::remove_dll_components_i (const ACE_TCHAR *dll_name)
|
|||
ACE_OS::strcmp (this->component_vector_[i]->dll_name_, dll_name) == 0)
|
||||
{
|
||||
if (ACE::debug ())
|
||||
ACE_DEBUG ((LM_DEBUG,
|
||||
ACELIB_DEBUG ((LM_DEBUG,
|
||||
ACE_TEXT ("AFR::remove_dll_components_i (%s) ")
|
||||
ACE_TEXT ("component \"%s\"\n"),
|
||||
dll_name, this->component_vector_[i]->name_));
|
||||
|
|
@ -268,7 +268,7 @@ ACE_Framework_Repository::ACE_Framework_Repository (int size)
|
|||
ACE_TRACE ("ACE_Framework_Repository::ACE_Framework_Repository");
|
||||
|
||||
if (this->open (size) == -1)
|
||||
ACE_ERROR ((LM_ERROR,
|
||||
ACELIB_ERROR ((LM_ERROR,
|
||||
ACE_TEXT ("%p\n"),
|
||||
ACE_TEXT ("ACE_Framework_Repository")));
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue