From 86c5f836d1a679208716a422839d7da38ba41059 Mon Sep 17 00:00:00 2001 From: levine Date: Thu, 31 Jul 1997 21:48:20 +0000 Subject: added ACE_HAS_INSTANTIATION_PRAGMA support --- ace/Dump.cpp | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) (limited to 'ace/Dump.cpp') diff --git a/ace/Dump.cpp b/ace/Dump.cpp index b84c61c380c..57e8aae7ac6 100644 --- a/ace/Dump.cpp +++ b/ace/Dump.cpp @@ -24,23 +24,23 @@ ACE_Dumpable::ACE_Dumpable (const void *this_ptr) } ACE_Dumpable_Ptr::ACE_Dumpable_Ptr (const ACE_Dumpable *dumper) - : dumper_ (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_; + return this->dumper_; } -void +void ACE_Dumpable_Ptr::operator= (const ACE_Dumpable *dumper) const { ACE_TRACE ("ACE_Dumpable_Ptr::operator="); - if (this->dumper_ != dumper) + if (this->dumper_ != dumper) { delete (ACE_Dumpable *) this->dumper_; ((ACE_Dumpable_Ptr *) this)->dumper_ = dumper; @@ -68,7 +68,7 @@ ACE_ODB::instance (void) return ACE_ODB::instance_; } -void +void ACE_ODB::dump_objects (void) { ACE_TRACE ("ACE_ODB::dump_objects"); @@ -83,7 +83,7 @@ ACE_ODB::dump_objects (void) // This method registers a new . It detects // duplicates and simply overwrites them. -void +void ACE_ODB::register_object (const ACE_Dumpable *dumper) { ACE_TRACE ("ACE_ODB::register_object"); @@ -110,7 +110,7 @@ ACE_ODB::register_object (const ACE_Dumpable *dumper) this->object_table_[slot].dumper_ = dumper; } -void +void ACE_ODB::remove_object (const void *this_ptr) { ACE_TRACE ("ACE_ODB::remove_object"); @@ -131,6 +131,11 @@ ACE_ODB::remove_object (const void *this_ptr) ACE_ODB *ACE_ODB::instance_ = 0; -#if defined (ACE_TEMPLATES_REQUIRE_SPECIALIZATION) +#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) ACE_MT (template class ACE_Guard); -#endif /* ACE_TEMPLATES_REQUIRE_SPECIALIZATION */ +#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) +#if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0) +#pragma instantiate ACE_Guard +#endif /* ACE_MT_SAFE */ +#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + -- cgit v1.2.1