See Fri Jun 25 12:38:43 1999 Matthew J Braun <mjb2@cs.wustl.edu>

3 files changed, 23 insertions, 16 deletions

diff --git a/TAO/ChangeLog-99c b/TAO/ChangeLog-99c
index 19733dab116..96bf6e19eac 100644
--- a/TAO/ChangeLog-99c
+++ b/TAO/ChangeLog-99c
@@ -1,3 +1,12 @@
+Fri Jun 25 12:38:43 1999  Matthew J Braun  <mjb2@cs.wustl.edu>
+
+	* examples/Logging/Logger_i.cpp,h
+	  Added default argument values for ACE_TRY_ENV to reflect tao_idl 
+	  generated code. Also removed a vestigal method (verbosity ())
+	  which was never declared in IDL (since its name would have
+	  clashed with the orhte verbosity method). Hopefully DU will be
+	  pleased now, since this messed up its compile.
+
 Fri Jun 25 11:45:18 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
 
 	* examples/POA/Loader/Servant_Locator.cpp (ServantLocator_i):
diff --git a/TAO/examples/Logging/Logger_i.cpp b/TAO/examples/Logging/Logger_i.cpp
index 2479ef17917..9a26913a788 100644
--- a/TAO/examples/Logging/Logger_i.cpp
+++ b/TAO/examples/Logging/Logger_i.cpp
@@ -185,12 +185,6 @@ Logger_i::logv (const Logger::Log_Record &log_rec,
   // verbosity
 }
 
-Logger::Verbosity_Level
-Logger_i::verbosity (void) const
-{
-  return verbosity_level_;
-}
-
 void
 Logger_i::verbosity (Logger::Verbosity_Level level,
                      CORBA::Environment &)
diff --git a/TAO/examples/Logging/Logger_i.h b/TAO/examples/Logging/Logger_i.h
index 9e3d0e60de8..c23a0659134 100644
--- a/TAO/examples/Logging/Logger_i.h
+++ b/TAO/examples/Logging/Logger_i.h
@@ -34,33 +34,36 @@ public:
   // destructor
 
   virtual void log (const Logger::Log_Record &log_rec,
-                    CORBA::Environment &ACE_TRY_ENV)
+                    CORBA::Environment &ACE_TRY_ENV =
+                    TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Writes the <log_rec> to the standard output.
 
   virtual void logv (const Logger::Log_Record &log_rec,
                      Logger::Verbosity_Level verbosity,
-                     CORBA::Environment &ACE_TRY_ENV)
+                     CORBA::Environment &ACE_TRY_ENV =
+                    TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Writes the <log_rec> to the standard output with the given
   // verbosity level
 
   virtual void log2 (const Logger::Log_Record &log_rec,
-                     CORBA::Environment &ACE_TRY_ENV)
+                     CORBA::Environment &ACE_TRY_ENV =
+                    TAO_default_environment ())
     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,
-                      CORBA::Environment &ACE_TRY_ENV)
+                      CORBA::Environment & ACE_TRY_ENV=
+                    TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Writes the <log_rec> to the standard output with the given
   // verbosity level
 
-  Logger::Verbosity_Level verbosity (void) const;
-  // Gets the verbosity level
-
-  void verbosity (Logger::Verbosity_Level level, CORBA::Environment &ACE_TRY_ENV)
+   void verbosity (Logger::Verbosity_Level level, 
+                  CORBA::Environment &ACE_TRY_ENV =
+                  TAO_default_environment ())
     ACE_THROW_SPEC (());
   // Sets the verbosity level. Valid values are {VERBOSE, VERBOSE_LITE
   //  and SILENT}. Defaults to VERBOSE
@@ -95,12 +98,13 @@ public:
   // Destructor.
 
   virtual Logger_ptr make_logger (const char *name,
-                                  CORBA::Environment &ACE_TRY_ENV)
+                                  CORBA::Environment &ACE_TRY_ENV =
+                                  TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
   // This function returns a logger with name <name>. If <name> is
   // unique, a new logger is created; else, a previously created
   // logger of name <name> is returned
-
+  
 private:
   ACE_Hash_Map_Manager<ACE_CString, Logger_i *, ACE_Null_Mutex> hash_map_;
   // Calls to <make_logger> will create a new instance of <Logger> and