diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/Log/Logger_i.cpp')
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Log/Logger_i.cpp | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Log/Logger_i.cpp b/TAO/orbsvcs/orbsvcs/Log/Logger_i.cpp index 907126cacaf..888f886cf00 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Logger_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/Logger_i.cpp @@ -8,6 +8,17 @@ ACE_RCSID(Log, Logger_i, "$Id$") +#if defined (ACE_HAS_TEMPLATE_SPECIALIZATION) +#define TAO_Logger_Hash \ + ACE_Hash_Map_Manager<ACE_CString, Logger_i *, ACE_Null_Mutex> + +u_long +TAO_Logger_Hash::hash (const ACE_CString &ext_id) +{ + return ACE::hash_pjw (ext_id.fast_rep ()); +} +#endif /* ACE_HAS_TEMPLATE_SPECIALIZATION */ + Logger_Factory_i::Logger_Factory_i (void) { } @@ -19,7 +30,6 @@ Logger_Factory_i::~Logger_Factory_i (void) Logger_ptr Logger_Factory_i::make_logger (const char *name, CORBA::Environment &TAO_IN_ENV) - ACE_THROW_SPEC ((CORBA::SystemException)) { Logger_i *result; // If name is already in the map, <find> will assign <result> to the @@ -112,7 +122,6 @@ Logger_i::verbosity_conversion (Logger::Verbosity_Level verbosity_level) void Logger_i::log (const Logger::Log_Record &log_rec, CORBA::Environment &TAO_IN_ENV) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->logv (log_rec, verbosity_level_, TAO_IN_ENV); } @@ -120,7 +129,6 @@ Logger_i::log (const Logger::Log_Record &log_rec, void Logger_i::log2 (const Logger::Log_Record &log_rec, CORBA::Environment &TAO_IN_ENV) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->logv (log_rec, verbosity_level_, TAO_IN_ENV); } @@ -129,7 +137,6 @@ void Logger_i::logv2 (const Logger::Log_Record &log_rec, Logger::Verbosity_Level verbosity, CORBA::Environment &TAO_IN_ENV) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->logv (log_rec, verbosity, TAO_IN_ENV); } @@ -138,7 +145,6 @@ void Logger_i::logv (const Logger::Log_Record &log_rec, Logger::Verbosity_Level verbosity, CORBA::Environment &) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Create an <ACE_Log_Record> to leverage existing logging // code. Since Logger::Log_Priority enum tags don't cleanly map to @@ -192,11 +198,10 @@ Logger_i::verbosity (void) const } void -Logger_i::verbosity (Logger::Verbosity_Level level, - CORBA::Environment &) - ACE_THROW_SPEC (()) +Logger_i::verbosity (Logger::Verbosity_Level level, CORBA::Environment &env) { - this->verbosity_level_ = level; + ACE_UNUSED_ARG (env); + verbosity_level_ = level; } #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) |