[Gnash-commit] gnash ChangeLog libbase/log.cpp libbase/log.h

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/10/20 10:26:47

Modified files:
        .              : ChangeLog 
        libbase        : log.cpp log.h 

Log message:
                * libbase/log.{cpp,h}: LogFile operator << for 'std::endl' (?) 
fixed
                  to return LogFile (not std::ostream).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1319&r2=1.1320
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/log.cpp?cvsroot=gnash&r1=1.31&r2=1.32
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/log.h?cvsroot=gnash&r1=1.28&r2=1.29

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1319
retrieving revision 1.1320
diff -u -b -r1.1319 -r1.1320
--- ChangeLog   20 Oct 2006 09:12:00 -0000      1.1319
+++ ChangeLog   20 Oct 2006 10:26:46 -0000      1.1320
@@ -1,5 +1,7 @@
 2006-10-20 Sandro Santilli <address@hidden>
 
+       * libbase/log.{cpp,h}: LogFile operator << for 'std::endl' (?) fixed
+         to return LogFile (not std::ostream).
        * testsuite/actionscript.all/Makefile.am: added 'check.as' and
          'xtrace.as' dependencies.
 

Index: libbase/log.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/log.cpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- libbase/log.cpp     11 Oct 2006 10:14:38 -0000      1.31
+++ libbase/log.cpp     20 Oct 2006 10:26:47 -0000      1.32
@@ -36,7 +36,7 @@
 //
 //
 
-/* $Id: log.cpp,v 1.31 2006/10/11 10:14:38 nihilus Exp $ */
+/* $Id: log.cpp,v 1.32 2006/10/20 10:26:47 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -682,7 +682,7 @@
 #endif
 
 /// \brief Grab the endl operator.
-ostream&
+LogFile&
 LogFile::operator << (ostream & (&)(ostream &))
 {
     scoped_lock lock(io_mutex);
@@ -704,8 +704,7 @@
     _state = IDLE;
     _trace = false;
     
-    // FIXME: This is probably not the value to return
-    return cout;
+    return *this;
 }
 
 } // end of gnash namespace

Index: libbase/log.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/log.h,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- libbase/log.h       18 Oct 2006 13:17:00 -0000      1.28
+++ libbase/log.h       20 Oct 2006 10:26:47 -0000      1.29
@@ -35,7 +35,7 @@
 // 
 //
 
-/* $Id: log.h,v 1.28 2006/10/18 13:17:00 strk Exp $ */
+/* $Id: log.h,v 1.29 2006/10/20 10:26:47 strk Exp $ */
 
 #ifndef GNASH_LOG_H
 #define GNASH_LOG_H
@@ -113,7 +113,7 @@
 // #ifdef HAVE_LIBXML
 //     LogFile& operator << (const xmlChar *c);
 // #endif
-    std::ostream& operator << (std::ostream & (&)(std::ostream &));
+    LogFile& operator << (std::ostream & (&)(std::ostream &));
     const char *getEntry(void);
     
     bool openLog(const char *filespec);