ChangeLogTag: Wed Dec 10 10:06:41 UTC 2003 Johnny Willemsen <jwillemsen@remedy.nl>

4 files changed, 26 insertions, 26 deletions

diff --git a/TAO/examples/Logging/Logger.idl b/TAO/examples/Logging/Logger.idl
index 7feaeafcfb6..7a38596fc40 100644
--- a/TAO/examples/Logging/Logger.idl
+++ b/TAO/examples/Logging/Logger.idl
@@ -23,27 +23,27 @@ interface Logger
     LM_SHUTDOWN,
     // Shutdown the logger
 
-    LM_TRACE,    
+    LM_TRACE,
     // Messages indicating function-calling sequence
 
-    LM_DEBUG,    
+    LM_DEBUG,
     // Messages that contain information normally of use only when
     // debugging a program
 
-    LM_INFO,	    
+    LM_INFO,
     // Informational messages
 
-    LM_NOTICE,   
+    LM_NOTICE,
     // Conditions that are not error conditions, but that may require
     // special handling
 
-    LM_WARNING,  
+    LM_WARNING,
     // Warning messages
 
-    LM_STARTUP,  
+    LM_STARTUP,
     // Initialize the logger
 
-    LM_ERROR,    
+    LM_ERROR,
     // Error messages
 
     LM_CRITICAL,
@@ -88,19 +88,19 @@ interface Logger
   oneway void log (in Log_Record log_rec);
   // Transmit a Log_Record to the logging server.
 
-  oneway void logv (in Log_Record log_rec, 
+  oneway void logv (in Log_Record log_rec,
 		    in Verbosity_Level level);
   // Log a message with a specific Verbosity level which may be
-  // differeny from the <verbosity_level> 
+  // differeny from the <verbosity_level>
 
-  void log2 (in Log_Record log_rec);
+  void log_twoway (in Log_Record log_rec);
   // Like log (), but twoway such that applications will block until
   // log messages are recieved by the logger
 
-  void logv2 (in Log_Record log_rec, 
+  void logv_twoway (in Log_Record log_rec,
 		    in Verbosity_Level level);
-  // Like logv (), but twoway for the same reason as log2 ()
-  
+  // Like logv (), but twoway for the same reason as logv_twoway ()
+
   oneway void verbosity (in Verbosity_Level level);
   // Change the state of the <verbosity_level>.  This controls how
   // much logging information is displayed by the server.
diff --git a/TAO/examples/Logging/Logger_i.cpp b/TAO/examples/Logging/Logger_i.cpp
index b634b8665ad..6881006c3f1 100644
--- a/TAO/examples/Logging/Logger_i.cpp
+++ b/TAO/examples/Logging/Logger_i.cpp
@@ -120,17 +120,17 @@ Logger_i::log (const Logger::Log_Record &log_rec
 }
 
 void
-Logger_i::log2 (const Logger::Log_Record &log_rec
-               ACE_ENV_ARG_DECL)
+Logger_i::log_twoway (const Logger::Log_Record &log_rec
+                      ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->logv (log_rec, verbosity_level_ ACE_ENV_ARG_PARAMETER);
 }
 
 void
-Logger_i::logv2 (const Logger::Log_Record &log_rec,
-               Logger::Verbosity_Level verbosity
-               ACE_ENV_ARG_DECL)
+Logger_i::logv_twoway (const Logger::Log_Record &log_rec,
+                       Logger::Verbosity_Level verbosity
+                       ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->logv (log_rec, verbosity ACE_ENV_ARG_PARAMETER);
diff --git a/TAO/examples/Logging/Logger_i.h b/TAO/examples/Logging/Logger_i.h
index 846a877be83..8d4ef584f81 100644
--- a/TAO/examples/Logging/Logger_i.h
+++ b/TAO/examples/Logging/Logger_i.h
@@ -48,14 +48,14 @@ public:
   // Writes the <log_rec> to the standard output with the given
   // verbosity level
 
-  virtual void log2 (const Logger::Log_Record &log_rec
-                     ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void log_twoway (const Logger::Log_Record &log_rec
+                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Writes the <log_rec> to the standard output.
 
-  virtual void logv2 (const Logger::Log_Record &log_rec,
-                      Logger::Verbosity_Level verbosity
-                      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void logv_twoway (const Logger::Log_Record &log_rec,
+                            Logger::Verbosity_Level verbosity
+                            ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Writes the <log_rec> to the standard output with the given
   // verbosity level
diff --git a/TAO/examples/Logging/Logging_Test_i.cpp b/TAO/examples/Logging/Logging_Test_i.cpp
index aeb14c150aa..bc70e388cbb 100644
--- a/TAO/examples/Logging/Logging_Test_i.cpp
+++ b/TAO/examples/Logging/Logging_Test_i.cpp
@@ -225,7 +225,7 @@ Logger_Client::run (void)
       // Setup the fourth log record
       this->init_record (rec4,
                          Logger::LM_EMERGENCY,
-                         "log2() test (4) \n");
+                         "log_twoway() test (4) \n");
 
       // If debugging, output the new log records
       if (TAO_debug_level > 0)
@@ -276,8 +276,8 @@ Logger_Client::run (void)
       this->logger_2_->verbosity (Logger::VERBOSE ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      // Log the fourth record using log2()
-      this->logger_2_->log2 (rec4 ACE_ENV_ARG_PARAMETER);
+      // Log the fourth record using log_twoway()
+      this->logger_2_->log_twoway (rec4 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }