[Uml-devel] kdesdk/umbrello/umbrello/classparser

[Hans Dijkema]

CVS commit by dijkema: 

Changed the ClassParser.h and tokenizer.l to work around a flaw in flex 2.5.4, which
doesn't use namespaces for cin, cout, cerr, istream and ostream. 


  M +7 -0      ClassParser.h   1.4
  M +6 -0      tokenizer.l   1.4


--- kdesdk/umbrello/umbrello/classparser/ClassParser.h  #1.3:1.4
@@ -20,4 +20,11 @@
 
 #include "ClassStore.h"
+
+/*** Patch - Fix FlexLexer.h flaw for flex 2.5.4 */
+#include <iostream>
+using std::istream;
+using std::ostream;
+/*** Patch - Fix FlexLexer.h flaw for flex 2.5.4 */
+
 #include <FlexLexer.h>
 #include <qptrstack.h>

--- kdesdk/umbrello/umbrello/classparser/tokenizer.l  #1.3:1.4
@@ -24,4 +24,10 @@
   #include "tokenizer.h"
 
+  /* Patch: Fix skeleton flaw for flex 2.5.4 */
+  using std::cin;
+  using std::cout;
+  using std::cerr;
+  /* Patch: Fix skeleton flaw for flex 2.5.4 */
+
   /* Line where a comment starts. */
   int comment_start = -1;