*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:
@@ -1,41 +1,32 @@
|
||||
// $Id: Dump.cpp 80826 2008-03-04 14:51:23Z wotte $
|
||||
|
||||
#include "ace/Dump.h"
|
||||
#include "ace/Guard_T.h"
|
||||
#include "ace/Thread_Mutex.h"
|
||||
#include "ace/Object_Manager.h"
|
||||
#include "ace/Log_Msg.h"
|
||||
|
||||
ACE_RCSID(ace, Dump, "$Id: Dump.cpp 80826 2008-03-04 14:51:23Z wotte $")
|
||||
|
||||
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
|
||||
|
||||
// Implementations (very simple for now...)
|
||||
|
||||
ACE_Dumpable::~ACE_Dumpable (void)
|
||||
{
|
||||
ACE_TRACE ("ACE_Dumpable::~ACE_Dumpable");
|
||||
}
|
||||
|
||||
ACE_Dumpable::ACE_Dumpable (const void *this_ptr)
|
||||
: this_ (this_ptr)
|
||||
{
|
||||
ACE_TRACE ("ACE_Dumpable::ACE_Dumpable");
|
||||
}
|
||||
|
||||
ACE_Dumpable_Ptr::ACE_Dumpable_Ptr (const ACE_Dumpable *dumper)
|
||||
: dumper_ (dumper)
|
||||
{
|
||||
ACE_TRACE ("ACE_Dumpable_Ptr::ACE_Dumpable_Ptr");
|
||||
}
|
||||
|
||||
const ACE_Dumpable *
|
||||
ACE_Dumpable_Ptr::operator->() const
|
||||
{
|
||||
ACE_TRACE ("ACE_Dumpable_Ptr::operator->");
|
||||
return this->dumper_;
|
||||
}
|
||||
|
||||
void
|
||||
ACE_Dumpable_Ptr::operator= (const ACE_Dumpable *dumper) const
|
||||
{
|
||||
@@ -46,35 +37,29 @@ ACE_Dumpable_Ptr::operator= (const ACE_Dumpable *dumper) const
|
||||
(const_cast<ACE_Dumpable_Ptr *> (this))->dumper_ = dumper;
|
||||
}
|
||||
}
|
||||
|
||||
ACE_ODB::ACE_ODB (void)
|
||||
// Let the Tuple default constructor initialize object_table_
|
||||
: current_size_ (0)
|
||||
{
|
||||
ACE_TRACE ("ACE_ODB::ACE_ODB");
|
||||
}
|
||||
|
||||
ACE_ODB *
|
||||
ACE_ODB::instance (void)
|
||||
{
|
||||
ACE_TRACE ("ACE_ODB::instance");
|
||||
|
||||
if (ACE_ODB::instance_ == 0)
|
||||
{
|
||||
ACE_MT (ACE_Thread_Mutex *lock =
|
||||
ACE_Managed_Object<ACE_Thread_Mutex>::get_preallocated_object
|
||||
(ACE_Object_Manager::ACE_DUMP_LOCK);
|
||||
ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, *lock, 0));
|
||||
|
||||
if (ACE_ODB::instance_ == 0)
|
||||
ACE_NEW_RETURN (ACE_ODB::instance_,
|
||||
ACE_ODB,
|
||||
0);
|
||||
}
|
||||
|
||||
return ACE_ODB::instance_;
|
||||
}
|
||||
|
||||
void
|
||||
ACE_ODB::dump_objects (void)
|
||||
{
|
||||
@@ -86,17 +71,14 @@ ACE_ODB::dump_objects (void)
|
||||
this->object_table_[i].dumper_->dump ();
|
||||
}
|
||||
}
|
||||
|
||||
// This method registers a new <dumper>. It detects
|
||||
// duplicates and simply overwrites them.
|
||||
|
||||
void
|
||||
ACE_ODB::register_object (const ACE_Dumpable *dumper)
|
||||
{
|
||||
ACE_TRACE ("ACE_ODB::register_object");
|
||||
int i;
|
||||
int slot = 0;
|
||||
|
||||
for (i = 0; i < this->current_size_; i++)
|
||||
{
|
||||
if (this->object_table_[i].this_ == 0)
|
||||
@@ -107,7 +89,6 @@ ACE_ODB::register_object (const ACE_Dumpable *dumper)
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (i == this->current_size_)
|
||||
{
|
||||
slot = this->current_size_++;
|
||||
@@ -116,27 +97,22 @@ ACE_ODB::register_object (const ACE_Dumpable *dumper)
|
||||
this->object_table_[slot].this_ = dumper->this_;
|
||||
this->object_table_[slot].dumper_ = dumper;
|
||||
}
|
||||
|
||||
void
|
||||
ACE_ODB::remove_object (const void *this_ptr)
|
||||
{
|
||||
ACE_TRACE ("ACE_ODB::remove_object");
|
||||
int i;
|
||||
|
||||
for (i = 0; i < this->current_size_; i++)
|
||||
{
|
||||
if (this->object_table_[i].this_ == this_ptr)
|
||||
break;
|
||||
}
|
||||
|
||||
if (i < this->current_size_)
|
||||
{
|
||||
this->object_table_[i].this_ = 0;
|
||||
this->object_table_[i].dumper_ = 0;
|
||||
}
|
||||
}
|
||||
|
||||
ACE_ODB *ACE_ODB::instance_ = 0;
|
||||
|
||||
ACE_END_VERSIONED_NAMESPACE_DECL
|
||||
|
||||
|
||||
Reference in New Issue
Block a user