Break lines and add const

1 files changed, 10 insertions, 10 deletions

diff --git a/TAO/TAO_IDL/util/utl_global.cpp b/TAO/TAO_IDL/util/utl_global.cpp
index 0f4a9dcc29e..de6b9912963 100644
--- a/TAO/TAO_IDL/util/utl_global.cpp
+++ b/TAO/TAO_IDL/util/utl_global.cpp
@@ -1953,11 +1953,12 @@ namespace
   {
   public:
     explicit OldState (bool disable_output = false)
-        : old_filename_ (idl_global->filename () ? new UTL_String (idl_global->filename (), true) : 0), // need a copy because IDL_GlobalData::set_filename() destroys previous value
+        : old_filename_ (idl_global->filename () ? new UTL_String (idl_global->filename (), true) : 0),
+          // need a copy because IDL_GlobalData::set_filename() destroys previous value
           old_lineno_ (idl_global->lineno ()),
           old_idl_src_file_ (idl_global->idl_src_file ()),
           disable_output_ (disable_output),
-          default_streambuf_ (0),
+          default_streambuf_ (ACE_DEFAULT_LOG_STREAM->rdbuf ()),
           flags_ (ACE_LOG_MSG->flags ())
       {
         idl_global->in_eval_ = true;
@@ -1971,19 +1972,18 @@ namespace
 
         if (disable_output_)
           {
-            default_streambuf_ = ACE_DEFAULT_LOG_STREAM->rdbuf ();
             ACE_DEFAULT_LOG_STREAM->rdbuf (0);
             ACE_LOG_MSG->clr_flags (ACE_Log_Msg::STDERR);
             ACE_LOG_MSG->clr_flags (ACE_LOG_MSG->flags ());
          }
       }
 
-      UTL_String pseudo_filename ()
+      UTL_String pseudo_filename () const
       {
         // Name this pseudo-file "builtin-N"
         static char buffer[64];
         ACE_OS::snprintf (&buffer[0], sizeof buffer, "builtin-%u", pseudo_filename_counter_);
-        UTL_String filename (&buffer[0], true);
+        const UTL_String filename (&buffer[0], true);
 
         return filename;
       }
@@ -2010,11 +2010,11 @@ namespace
       }
 
     private:
-      UTL_String *old_filename_;
-      long old_lineno_;
-      UTL_String *old_idl_src_file_;
-      bool disable_output_;
-      std::streambuf *default_streambuf_;
+      UTL_String *const old_filename_;
+      const long old_lineno_;
+      UTL_String *const old_idl_src_file_;
+      const bool disable_output_;
+      std::streambuf *const default_streambuf_;
       const unsigned long flags_;
       static unsigned pseudo_filename_counter_;
   };