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

List:       kde-core-devel
Subject:    kdesdk/kbabel/common
From:       Arnold Krille <kde () arnoldarts ! de>
Date:       2003-10-28 17:19:30
[Download RAW message or body]

[Attachment #2 (multipart/mixed)]


Hi all,

while trying to compile kdesdk I had to apply the attached patch to the above 
quoted directory.

Is it okay to commit it? Is anyone else affected by this and willing to commit 
it?

Arnold

-- 
Get my public-key from pgp.mit.edu or pgp.uni-mainz.de

["kbabel.diff" (text/x-diff)]

Index: poinfo.cpp
===================================================================
RCS file: /home/kde/kdesdk/kbabel/common/poinfo.cpp,v
retrieving revision 1.11
diff -u -p -r1.11 poinfo.cpp
--- poinfo.cpp	28 Oct 2003 04:12:48 -0000	1.11
+++ poinfo.cpp	28 Oct 2003 17:09:56 -0000
@@ -48,6 +48,7 @@ extern "C"
 #include "libgettext/tokens.h"
 
 #include <fstream>
+#include <iostream>
 
 using namespace KBabel;
 
@@ -363,7 +364,7 @@ ConversionStatus PoInfo::info(const QStr
 
            // AIX needs a dynamic_cast to get the right base class.  I think
            // a failure is properly handled here so no test for null is needed.
-	   GettextFlexLexer* lexer = new GettextFlexLexer( dynamic_cast<istream*>(stream) );
+	   GettextFlexLexer* lexer = new GettextFlexLexer( dynamic_cast<std::istream*>(stream) );
 
 	   lexer->yylex();
 	   
@@ -491,7 +492,7 @@ bool PoInfo::findInFile( const QString u
 	   
            // AIX needs a dynamic_cast to get the right base class.  I think
            // a failure is properly handled here so no test for null is needed.
-	   GettextFlexLexer* lexer = new GettextFlexLexer( dynamic_cast<istream*>(stream) );
+	   GettextFlexLexer* lexer = new GettextFlexLexer( dynamic_cast<std::istream*>(stream) );
 
 	   lexer->yylex();
 
Index: libgettext/pofiles.h
===================================================================
RCS file: /home/kde/kdesdk/kbabel/common/libgettext/pofiles.h,v
retrieving revision 1.3
diff -u -p -r1.3 pofiles.h
--- libgettext/pofiles.h	28 Oct 2003 04:12:48 -0000	1.3
+++ libgettext/pofiles.h	28 Oct 2003 17:09:56 -0000
@@ -5,11 +5,13 @@
 #define yyFlexLexer GettextBaseFlexLexer
 #include <FlexLexer.h>
 
+#include <iostream>
+
 class GettextFlexLexer: public GettextBaseFlexLexer {
 public:
     int lastToken;
     
-    GettextFlexLexer(istream* stream) : GettextBaseFlexLexer(stream) {}
+    GettextFlexLexer(std::istream* stream) : GettextBaseFlexLexer(stream) {}
     
     int yylex()
     {

[Attachment #6 (application/pgp-signature)]

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