diff options
| author | levine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-01-13 15:51:08 +0000 |
|---|---|---|
| committer | levine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-01-13 15:51:08 +0000 |
| commit | f06194d5677677ce4716b33c36d79fb05a12ed91 (patch) | |
| tree | 74182f456a5a6d3c717555358f93e65bfdbe000b | |
| parent | 5b7552a7ced0fce92aeacfba6bd635f02a91348f (diff) | |
| download | ATCD-f06194d5677677ce4716b33c36d79fb05a12ed91.tar.gz | |
removed ACE_Equal_To<ACE_CString> explicit instantiation because it's
in tao/POA.cpp.
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Log/Logger_i.cpp | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Log/Logger_i.cpp b/TAO/orbsvcs/orbsvcs/Log/Logger_i.cpp index a8559e4e625..6e476ed1993 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Logger_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/Logger_i.cpp @@ -43,10 +43,10 @@ Logger_Factory_i::make_logger (const char *name, // This attempts to create a new Logger_i and throws an // exception and returns a null value if it fails ACE_NEW_THROW_RETURN (result, - Logger_i (name), - CORBA::NO_MEMORY (CORBA::COMPLETED_NO), - Logger::_nil ()); - } + Logger_i (name), + CORBA::NO_MEMORY (CORBA::COMPLETED_NO), + Logger::_nil ()); + } // Enter the new logger into the hash map. Check if the <bind> // fails and if so, throw an UNKNOWN exception. <result> may be @@ -56,7 +56,7 @@ Logger_Factory_i::make_logger (const char *name, { delete result; TAO_THROW_RETURN (CORBA::UNKNOWN (CORBA::COMPLETED_NO), - Logger::_nil ()); + Logger::_nil ()); } else // Logger of name <name> already bound. <result> is set @@ -64,7 +64,7 @@ Logger_Factory_i::make_logger (const char *name, if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "\nLogger name already bound")); - + // <_this> is an performance hit here, but apparently if the object // is already registered with the POA, it will ignore the second // registration attempt. @@ -210,7 +210,6 @@ Logger_i::verbosity (Logger::Verbosity_Level level, CORBA::Environment &env) template class ACE_Hash_Map_Entry<ACE_CString, Logger_i *>; template class ACE_Hash<ACE_CString>; -template class ACE_Equal_To<ACE_CString>; template class ACE_Hash_Map_Manager<ACE_CString, Logger_i *, ACE_Null_Mutex>; template class ACE_Hash_Map_Manager_Ex<ACE_CString, Logger_i *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>; template class ACE_Hash_Map_Iterator_Base_Ex<ACE_CString, Logger_i *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>; @@ -223,7 +222,6 @@ template class ACE_Hash_Map_Reverse_Iterator_Ex<ACE_CString, Logger_i *, ACE_Has #pragma instantiate ACE_Hash_Map_Entry<ACE_CString, Logger_i *> #pragma instantiate ACE_Hash<ACE_CString> -#pragma instantiate ACE_Equal_To<ACE_CString> #pragma instantiate ACE_Hash_Map_Manager<ACE_CString, Logger_i *, ACE_Null_Mutex> #pragma instantiate ACE_Hash_Map_Manager_Ex<ACE_CString, Logger_i *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex> #pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<ACE_CString, Logger_i *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex> |