[prev in list] [next in list] [prev in thread] [next in thread] 

List:       koffice
Subject:    Re: wv2 0.2 released
From:       Werner Trobin <trobin () kde ! org>
Date:       2003-11-05 19:17:13
[Download RAW message or body]

On Wednesday 05 November 2003 18:30, Werner Trobin wrote:
> On Wednesday 05 November 2003 15:32, Rex Dieter wrote:
> > Werner Trobin wrote:
> > >  I just packaged and released wv2-0.2,
> >
> > FYI, still not compilable with gcc-2.9x, see sourceforge bug #'s 804612,
> > 836511 for details.  (Or should I post these (somehow) to bugs.kde.org?)
>
> Ouch... I'm looking into it. I don't have such an old compiler around
> anymore, so this might take some time. I'll upload a new package as soon as
> I find a solution.


Okay, here we go. Please apply the attached patch from within wv2/src. It 
should compile and work then.

Ciao,
Werner
["wvlog.diff" (text/x-diff)]

Index: wvlog.h
===================================================================
RCS file: /cvsroot/wvware/wv2/src/wvlog.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -b -u -p -r1.5 -r1.6
--- wvlog.h	1 Sep 2003 12:30:26 -0000	1.5
+++ wvlog.h	5 Nov 2003 19:13:59 -0000	1.6
@@ -20,6 +20,7 @@
 #define WVLOG_H
 
 #include <iostream>
+#include <string>     // Make gcc 2.95.x happy
 
 /**
  * @file A very primitve logging mechanism used to disable any
@@ -32,9 +33,14 @@ namespace wvWare
     class wvdebugstream
     {
     public:
+#if defined(__GNUC__) && __GNUC__ < 3
+        const wvdebugstream& operator<<( ostream& (*__pf)( ostream& ) ) const { \
std::cerr << __pf; return *this; } +        const wvdebugstream& operator<<( ios \
(*__pf)( ios& ) ) const { std::cerr << __pf; return *this; } +#else
         const wvdebugstream& operator<<( std::basic_ostream<char>& (*__pf)( \
                std::basic_ostream<char>& ) ) const { std::cerr << __pf; return \
                *this; }
         const wvdebugstream& operator<<( std::ios<char> (*__pf)( std::ios<char>& ) ) \
                const { std::cerr << __pf; return *this; }
         const wvdebugstream& operator<<( std::ios_base& (*__pf) ( std::ios_base& ) ) \
const { std::cerr << __pf; return *this; } +#endif
         const wvdebugstream& operator<<( long l ) const { std::cerr << l; return \
                *this; }
         const wvdebugstream& operator<<( unsigned long l ) const { std::cerr << l; \
                return *this; }
         const wvdebugstream& operator<<( bool b ) const { std::cerr << b; return \
*this; } @@ -46,7 +52,11 @@ namespace wvWare
         const wvdebugstream& operator<<( float f ) const { std::cerr << f; return \
                *this; }
         const wvdebugstream& operator<<( long double d ) const { std::cerr << d; \
                return *this; }
         const wvdebugstream& operator<<( const void* cv ) const { std::cerr << cv; \
return *this; } +#if defined(__GNUC__) && __GNUC__ < 3
+        const wvdebugstream& operator<<( streambuf* s ) const { std::cerr << s; \
return *this; } +#else
         const wvdebugstream& operator<<( std::basic_streambuf<char>* s ) const { \
std::cerr << s; return *this; } +#endif
         const wvdebugstream& operator<<( signed char c ) const { std::cerr << c; \
                return *this; }
         const wvdebugstream& operator<<( unsigned char c ) const { std::cerr << c; \
                return *this; }
         const wvdebugstream& operator<<( const char* s ) const { std::cerr << s; \
return *this; } @@ -57,9 +67,14 @@ namespace wvWare
     class wvnodebugstream
     {
     public:
+#if defined(__GNUC__) && __GNUC__ < 3
+        const wvnodebugstream& operator<<( ostream& (*__pf)( ostream& ) ) const { \
std::cerr << __pf; return *this; } +        const wvnodebugstream& operator<<( ios \
(*__pf)( ios& ) ) const { std::cerr << __pf; return *this; } +#else
         const wvnodebugstream& operator<<( std::basic_ostream<char>& (*__pf)( \
                std::basic_ostream<char>& ) ) const { return *this; }
         const wvnodebugstream& operator<<( std::ios<char> (*__pf)( std::ios<char>& ) \
                ) const { return *this; }
         const wvnodebugstream& operator<<( std::ios_base& (*__pf) ( std::ios_base& ) \
) const { return *this; } +#endif
         const wvnodebugstream& operator<<( long ) const { return *this; }
         const wvnodebugstream& operator<<( unsigned long ) const { return *this; }
         const wvnodebugstream& operator<<( bool ) const { return *this; }
@@ -71,7 +86,11 @@ namespace wvWare
         const wvnodebugstream& operator<<( float ) const { return *this; }
         const wvnodebugstream& operator<<( long double ) const { return *this; }
         const wvnodebugstream& operator<<( const void* ) const { return *this; }
+#if defined(__GNUC__) && __GNUC__ < 3
+        const wvnodebugstream& operator<<( streambuf* ) const { return *this; }
+#else
         const wvnodebugstream& operator<<( std::basic_streambuf<char>* ) const { \
return *this; } +#endif
         const wvnodebugstream& operator<<( signed char ) const { return *this; }
         const wvnodebugstream& operator<<( unsigned char ) const { return *this; }
         const wvnodebugstream& operator<<( const char* ) const { return *this; }



____________________________________
koffice mailing list
koffice@mail.kde.org
To unsubscribe please visit:
https://mail.kde.org/mailman/listinfo/koffice


[prev in list] [next in list] [prev in thread] [next in thread]