1 files changed, 10 insertions, 17 deletions

diff --git a/TAO/examples/Logging/Logger_i.cpp b/TAO/examples/Logging/Logger_i.cpp
index 1e425fbd119..8f9b28bd67a 100644
--- a/TAO/examples/Logging/Logger_i.cpp
+++ b/TAO/examples/Logging/Logger_i.cpp
@@ -19,8 +19,7 @@ Logger_Factory_i::~Logger_Factory_i (void)
 }
 
 Logger_ptr
-Logger_Factory_i::make_logger (const char *name
-                               ACE_ENV_ARG_DECL)
+Logger_Factory_i::make_logger (const char *name)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Logger_i *result;
@@ -38,7 +37,6 @@ Logger_Factory_i::make_logger (const char *name
       ACE_NEW_THROW_EX (result,
                         Logger_i (name),
                         CORBA::NO_MEMORY ());
-      ACE_CHECK_RETURN (Logger::_nil ());
     }
 
   // Enter the new logger into the hash map.  Check if the <bind>
@@ -63,7 +61,7 @@ Logger_Factory_i::make_logger (const char *name
   // registration attempt.
   // @@ Matt, this code doesn't seem right.  Can you please check with
   // Irfan and Carlos about whether this is the right thing to do?
-  return result->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return result->_this ();
 }
 
 Logger_i::Logger_i (const char *name)
@@ -111,34 +109,30 @@ Logger_i::verbosity_conversion (Logger::Verbosity_Level verbosity_level)
 }
 
 void
-Logger_i::log (const Logger::Log_Record &log_rec
-               ACE_ENV_ARG_DECL)
+Logger_i::log (const Logger::Log_Record &log_rec)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->logv (log_rec, verbosity_level_ ACE_ENV_ARG_PARAMETER);
+  this->logv (log_rec, verbosity_level_);
 }
 
 void
-Logger_i::log_twoway (const Logger::Log_Record &log_rec
-                      ACE_ENV_ARG_DECL)
+Logger_i::log_twoway (const Logger::Log_Record &log_rec)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->logv (log_rec, verbosity_level_ ACE_ENV_ARG_PARAMETER);
+  this->logv (log_rec, verbosity_level_);
 }
 
 void
 Logger_i::logv_twoway (const Logger::Log_Record &log_rec,
-                       Logger::Verbosity_Level verbosity
-                       ACE_ENV_ARG_DECL)
+                       Logger::Verbosity_Level verbosity)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->logv (log_rec, verbosity ACE_ENV_ARG_PARAMETER);
+  this->logv (log_rec, verbosity);
 }
 
 void
 Logger_i::logv (const Logger::Log_Record &log_rec,
-               Logger::Verbosity_Level verbosity
-               ACE_ENV_ARG_DECL_NOT_USED)
+               Logger::Verbosity_Level verbosity)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Create an <ACE_Log_Record> to leverage existing logging
@@ -186,8 +180,7 @@ Logger_i::logv (const Logger::Log_Record &log_rec,
 }
 
 void
-Logger_i::verbosity (Logger::Verbosity_Level level
-                     ACE_ENV_ARG_DECL_NOT_USED)
+Logger_i::verbosity (Logger::Verbosity_Level level)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->verbosity_level_ = level;