1 files changed, 16 insertions, 16 deletions

diff --git a/TAO/examples/Logging/Logger_i.cpp b/TAO/examples/Logging/Logger_i.cpp
index 6a76e648b70..6a1cf278034 100644
--- a/TAO/examples/Logging/Logger_i.cpp
+++ b/TAO/examples/Logging/Logger_i.cpp
@@ -18,8 +18,8 @@ Logger_Factory_i::~Logger_Factory_i (void)
 }
 
 Logger_ptr
-Logger_Factory_i::make_logger (const char *name,
-                               CORBA::Environment &ACE_TRY_ENV)
+Logger_Factory_i::make_logger (const char *name
+                               TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Logger_i *result;
@@ -62,7 +62,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_TRY_ENV);
+  return result->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 Logger_i::Logger_i (const char *name)
@@ -111,34 +111,34 @@ Logger_i::verbosity_conversion (Logger::Verbosity_Level verbosity_level)
 }
 
 void
-Logger_i::log (const Logger::Log_Record &log_rec,
-               CORBA::Environment &ACE_TRY_ENV)
+Logger_i::log (const Logger::Log_Record &log_rec
+               TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->logv (log_rec, verbosity_level_, ACE_TRY_ENV);
+  this->logv (log_rec, verbosity_level_ TAO_ENV_ARG_PARAMETER);
 }
 
 void
-Logger_i::log2 (const Logger::Log_Record &log_rec,
-               CORBA::Environment &ACE_TRY_ENV)
+Logger_i::log2 (const Logger::Log_Record &log_rec
+               TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->logv (log_rec, verbosity_level_, ACE_TRY_ENV);
+  this->logv (log_rec, verbosity_level_ TAO_ENV_ARG_PARAMETER);
 }
 
 void
 Logger_i::logv2 (const Logger::Log_Record &log_rec,
-               Logger::Verbosity_Level verbosity,
-               CORBA::Environment &ACE_TRY_ENV)
+               Logger::Verbosity_Level verbosity
+               TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->logv (log_rec, verbosity, ACE_TRY_ENV);
+  this->logv (log_rec, verbosity TAO_ENV_ARG_PARAMETER);
 }
 
 void
 Logger_i::logv (const Logger::Log_Record &log_rec,
-               Logger::Verbosity_Level verbosity,
-               CORBA::Environment &)
+               Logger::Verbosity_Level verbosity
+               TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Create an <ACE_Log_Record> to leverage existing logging
@@ -187,8 +187,8 @@ Logger_i::logv (const Logger::Log_Record &log_rec,
 }
 
 void
-Logger_i::verbosity (Logger::Verbosity_Level level,
-                     CORBA::Environment &)
+Logger_i::verbosity (Logger::Verbosity_Level level
+                     TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->verbosity_level_ = level;