[S11n-cvs] SF.net SVN: s11n:[286] trunk/src

[<sg...@us...>]

Revision: 286
          http://s11n.svn.sourceforge.net/s11n/?rev=286&view=rev
Author:   sgbeal
Date:     2010-06-09 19:54:35 +0000 (Wed, 09 Jun 2010)

Log Message:
-----------
pulled in gcc 4.4x compatibility fixes from the 1.2.x tree.

Modified Paths:
--------------
    trunk/src/io/compact/compact.flex
    trunk/src/io/compact/compact.flex.cpp
    trunk/src/io/funtxt/funtxt.flex
    trunk/src/io/funtxt/funtxt.flex.cpp
    trunk/src/io/funxml/funxml.flex.cpp
    trunk/src/io/parens/parens.flex.cpp
    trunk/src/io/simplexml/simplexml.flex.cpp
    trunk/src/io/wesnoth/wesnoth.flex
    trunk/src/io/wesnoth/wesnoth.flex.cpp
    trunk/src/s11n/vappendf.cpp

Modified: trunk/src/io/compact/compact.flex
===================================================================
--- trunk/src/io/compact/compact.flex	2010-06-09 19:43:37 UTC (rev 285)
+++ trunk/src/io/compact/compact.flex	2010-06-09 19:54:35 UTC (rev 286)
@@ -8,12 +8,12 @@
 #define YY_SKIP_YYWRAP 1
 int yywrap() { return 1; }
 
-#include <stdio.h> // only for EOF definition
+// #include <stdio.h>
 #include <cassert>
 #include <iostream>
 #include <string>
 #include <deque>
-
+#include <stdio.h> // only for EOF definition
 #include <s11n.net/s11n/s11n_debuggering_macros.hpp> // CERR
 #define PCERR if( 0 ) CERR << "compact.flex error:"
 

Modified: trunk/src/io/compact/compact.flex.cpp
===================================================================
--- trunk/src/io/compact/compact.flex.cpp	2010-06-09 19:43:37 UTC (rev 285)
+++ trunk/src/io/compact/compact.flex.cpp	2010-06-09 19:54:35 UTC (rev 286)
@@ -4,7 +4,7 @@
 /* A lexical scanner generated by flex */
 
 /* Scanner skeleton version:
- * $Header: /home/daffy/u0/vern/flex/RCS/flex.skl,v 2.91 96/09/10 16:58:48 vern Exp $
+ * $Header: /cvsroot/s11n/1.1/s11n/src/io/compact/compact.flex.cpp,v 1.8 2009/11/03 18:13:48 sgbeal Exp $
  */
 
 #define FLEX_SCANNER
@@ -345,7 +345,7 @@
 #include <iostream>
 #include <string>
 #include <deque>
-
+#include <stdio.h> // only for EOF definition
 #include <s11n.net/s11n/s11n_debuggering_macros.hpp> // CERR
 #define PCERR if( 0 ) CERR << "compact.flex error:"
 

Modified: trunk/src/io/funtxt/funtxt.flex
===================================================================
--- trunk/src/io/funtxt/funtxt.flex	2010-06-09 19:43:37 UTC (rev 285)
+++ trunk/src/io/funtxt/funtxt.flex	2010-06-09 19:54:35 UTC (rev 286)
@@ -1,7 +1,6 @@
 %option c++
 %{
 
-
 namespace { // to get doxygen to ignore these comments :/
     /**
        my first lex :)
@@ -62,11 +61,11 @@
 #  undef NDEBUG // force assert()
 #endif
 
-#include <stdio.h> // only for EOF definition
 #include <iostream>
 #include <string>
 #include <deque>
 #include <cassert>
+#include <stdio.h> // only for EOF definition
 
 
 #include <s11n.net/s11n/io/strtool.hpp> // translate_entities()

Modified: trunk/src/io/funtxt/funtxt.flex.cpp
===================================================================
--- trunk/src/io/funtxt/funtxt.flex.cpp	2010-06-09 19:43:37 UTC (rev 285)
+++ trunk/src/io/funtxt/funtxt.flex.cpp	2010-06-09 19:54:35 UTC (rev 286)
@@ -4,7 +4,7 @@
 /* A lexical scanner generated by flex */
 
 /* Scanner skeleton version:
- * $Header: /home/daffy/u0/vern/flex/RCS/flex.skl,v 2.91 96/09/10 16:58:48 vern Exp $
+ * $Header: /cvsroot/s11n/1.1/s11n/src/io/funtxt/funtxt.flex.cpp,v 1.5 2009/11/03 18:15:59 sgbeal Exp $
  */
 
 #define FLEX_SCANNER
@@ -478,7 +478,6 @@
 #define INITIAL 0
 #line 3 "funtxt.flex"
 
-
 namespace { // to get doxygen to ignore these comments :/
     /**
        my first lex :)
@@ -543,6 +542,7 @@
 #include <string>
 #include <deque>
 #include <cassert>
+#include <stdio.h> // only for EOF definition
 
 
 #include <s11n.net/s11n/io/strtool.hpp> // translate_entities()

Modified: trunk/src/io/funxml/funxml.flex.cpp
===================================================================
--- trunk/src/io/funxml/funxml.flex.cpp	2010-06-09 19:43:37 UTC (rev 285)
+++ trunk/src/io/funxml/funxml.flex.cpp	2010-06-09 19:54:35 UTC (rev 286)
@@ -4,7 +4,7 @@
 /* A lexical scanner generated by flex */
 
 /* Scanner skeleton version:
- * $Header: /home/daffy/u0/vern/flex/RCS/flex.skl,v 2.91 96/09/10 16:58:48 vern Exp $
+ * $Header: /cvsroot/s11n/1.1/s11n/src/io/funxml/funxml.flex.cpp,v 1.5 2009/11/03 18:15:59 sgbeal Exp $
  */
 
 #define FLEX_SCANNER
@@ -379,7 +379,7 @@
 #define YY_SKIP_YYWRAP 1
 int yywrap() { return 1; }
 
-// #include <stdio.h>
+#include <stdio.h> // only for EOF definition
 #include <cassert>
 #include <iostream>
 #include <string>

Modified: trunk/src/io/parens/parens.flex.cpp
===================================================================
--- trunk/src/io/parens/parens.flex.cpp	2010-06-09 19:43:37 UTC (rev 285)
+++ trunk/src/io/parens/parens.flex.cpp	2010-06-09 19:54:35 UTC (rev 286)
@@ -4,7 +4,7 @@
 /* A lexical scanner generated by flex */
 
 /* Scanner skeleton version:
- * $Header: /home/daffy/u0/vern/flex/RCS/flex.skl,v 2.91 96/09/10 16:58:48 vern Exp $
+ * $Header: /cvsroot/s11n/1.1/s11n/src/io/parens/parens.flex.cpp,v 1.5 2009/11/03 18:15:59 sgbeal Exp $
  */
 
 #define FLEX_SCANNER
@@ -511,6 +511,7 @@
 #define YY_SKIP_YYWRAP 1
 int yywrap() { return 1; }
 
+#include <stdio.h> // only for EOF definition
 #include <iostream>
 #include <string>
 #include <stdexcept>
@@ -697,7 +698,7 @@
 	register char *yy_cp, *yy_bp;
 	register int yy_act;
 
-#line 136 "parens.flex"
+#line 137 "parens.flex"
 
 
 
@@ -781,14 +782,14 @@
 
 case 1:
 YY_RULE_SETUP
-#line 138 "parens.flex"
+#line 139 "parens.flex"
 { // (* comment blocks *)
 	BEGIN IN_COMMENT_BLOCK;
 	}
 	YY_BREAK
 case 2:
 YY_RULE_SETUP
-#line 142 "parens.flex"
+#line 143 "parens.flex"
 {
         PCERR << "hit EOF in a (*comment block*)." << std::endl;
         throw std::runtime_error( "hit EOF in a (*comment block*)" );
@@ -797,17 +798,17 @@
 	YY_BREAK
 case 3:
 YY_RULE_SETUP
-#line 147 "parens.flex"
+#line 148 "parens.flex"
 { /* this match isn't 100% correct.*/ BEGIN 0; }
 	YY_BREAK
 case 4:
 YY_RULE_SETUP
-#line 148 "parens.flex"
+#line 149 "parens.flex"
 { continue;}
 	YY_BREAK
 case 5:
 YY_RULE_SETUP
-#line 149 "parens.flex"
+#line 150 "parens.flex"
 { continue;}
 	YY_BREAK
 case 6:
@@ -815,19 +816,19 @@
 yy_c_buf_p = yy_cp -= 1;
 YY_DO_BEFORE_ACTION; /* set up yytext again */
 YY_RULE_SETUP
-#line 151 "parens.flex"
+#line 152 "parens.flex"
 {;} // comment lines
 	YY_BREAK
 case 7:
 YY_RULE_SETUP
-#line 155 "parens.flex"
+#line 156 "parens.flex"
 {
         BEGIN IN_PROPERTY;
 	}
 	YY_BREAK
 case 8:
 YY_RULE_SETUP
-#line 159 "parens.flex"
+#line 160 "parens.flex"
 { // key name of property
         std::string propname = YYText();
 
@@ -879,7 +880,7 @@
 	YY_BREAK
 case 9:
 YY_RULE_SETUP
-#line 208 "parens.flex"
+#line 209 "parens.flex"
 {
         std::string tmpstr = YYText();
         METADATA(nodename) = tmpstr.substr( 0, tmpstr.find( "=" ) );
@@ -889,12 +890,12 @@
 	YY_BREAK
 case 10:
 YY_RULE_SETUP
-#line 216 "parens.flex"
+#line 217 "parens.flex"
 {;}
 	YY_BREAK
 case 11:
 YY_RULE_SETUP
-#line 218 "parens.flex"
+#line 219 "parens.flex"
 { // special case: empty node:
         --METADATA(internaldepth);
         BEGIN 0;
@@ -902,12 +903,12 @@
 	YY_BREAK
 case 12:
 YY_RULE_SETUP
-#line 222 "parens.flex"
+#line 223 "parens.flex"
 {;}
 	YY_BREAK
 case 13:
 YY_RULE_SETUP
-#line 224 "parens.flex"
+#line 225 "parens.flex"
 {
         std::string & nodename = METADATA(nodename);
         std::string & nodeclass = METADATA(nodeclass);
@@ -939,7 +940,7 @@
 	YY_BREAK
 case 14:
 YY_RULE_SETUP
-#line 253 "parens.flex"
+#line 254 "parens.flex"
 {
         std::string & nodename = METADATA(nodename);
         std::string errmsg = "did not find class name after '" + nodename + "'.";
@@ -950,7 +951,7 @@
 	YY_BREAK
 case 15:
 YY_RULE_SETUP
-#line 261 "parens.flex"
+#line 262 "parens.flex"
 {
         PCERR << METADATA(internaldepth)<< " Closing node" << std::endl;
         BuilderContext::close_node( this );
@@ -965,22 +966,22 @@
 	YY_BREAK
 case 16:
 YY_RULE_SETUP
-#line 274 "parens.flex"
+#line 275 "parens.flex"
 { continue;} // magic cookie
 	YY_BREAK
 case 17:
 YY_RULE_SETUP
-#line 276 "parens.flex"
+#line 277 "parens.flex"
 {;}
 	YY_BREAK
 case 18:
 YY_RULE_SETUP
-#line 278 "parens.flex"
+#line 279 "parens.flex"
 { PCERR << "Unexpected token: [" << YYText()<<"]"<<std::endl;}
 	YY_BREAK
 case 19:
 YY_RULE_SETUP
-#line 281 "parens.flex"
+#line 282 "parens.flex"
 ECHO;
 	YY_BREAK
 case YY_STATE_EOF(INITIAL):
@@ -1796,7 +1797,7 @@
 	return 0;
 	}
 #endif
-#line 281 "parens.flex"
+#line 282 "parens.flex"
 
 // ^{SPACE}*[#;].*$ {;} // comment lines
 // [#;][^{OPENER}]* {;} // comments trailing after node closures

Modified: trunk/src/io/simplexml/simplexml.flex.cpp
===================================================================
--- trunk/src/io/simplexml/simplexml.flex.cpp	2010-06-09 19:43:37 UTC (rev 285)
+++ trunk/src/io/simplexml/simplexml.flex.cpp	2010-06-09 19:54:35 UTC (rev 286)
@@ -4,7 +4,7 @@
 /* A lexical scanner generated by flex */
 
 /* Scanner skeleton version:
- * $Header: /home/daffy/u0/vern/flex/RCS/flex.skl,v 2.91 96/09/10 16:58:48 vern Exp $
+ * $Header: /cvsroot/s11n/1.1/s11n/src/io/simplexml/simplexml.flex.cpp,v 1.5 2009/11/03 18:15:59 sgbeal Exp $
  */
 
 #define FLEX_SCANNER
@@ -752,7 +752,7 @@
 #define YY_SKIP_YYWRAP 1
 int yywrap() { return 1; }
 
-// #include <stdio.h>
+#include <stdio.h> // only for EOF definition
 #include <cassert>
 #include <iostream>
 #include <string>

Modified: trunk/src/io/wesnoth/wesnoth.flex
===================================================================
--- trunk/src/io/wesnoth/wesnoth.flex	2010-06-09 19:43:37 UTC (rev 285)
+++ trunk/src/io/wesnoth/wesnoth.flex	2010-06-09 19:54:35 UTC (rev 286)
@@ -10,6 +10,7 @@
 #ifdef NDEBUG
 #  undef NDEBUG // force assert()
 #endif
+
 #include <stdio.h> // only for EOF definition
 #include <iostream>
 #include <string>

Modified: trunk/src/io/wesnoth/wesnoth.flex.cpp
===================================================================
--- trunk/src/io/wesnoth/wesnoth.flex.cpp	2010-06-09 19:43:37 UTC (rev 285)
+++ trunk/src/io/wesnoth/wesnoth.flex.cpp	2010-06-09 19:54:35 UTC (rev 286)
@@ -4,7 +4,7 @@
 /* A lexical scanner generated by flex */
 
 /* Scanner skeleton version:
- * $Header: /home/daffy/u0/vern/flex/RCS/flex.skl,v 2.91 96/09/10 16:58:48 vern Exp $
+ * $Header: /cvsroot/s11n/1.1/s11n/src/io/wesnoth/wesnoth.flex.cpp,v 1.5 2009/11/03 18:15:59 sgbeal Exp $
  */
 
 #define FLEX_SCANNER
@@ -413,6 +413,7 @@
 #  undef NDEBUG // force assert()
 #endif
 
+#include <stdio.h> // only for EOF definition
 #include <iostream>
 #include <string>
 #include <deque>
@@ -624,7 +625,7 @@
 	register char *yy_cp, *yy_bp;
 	register int yy_act;
 
-#line 140 "wesnoth.flex"
+#line 141 "wesnoth.flex"
 
 
 
@@ -708,12 +709,12 @@
 
 case 1:
 YY_RULE_SETUP
-#line 142 "wesnoth.flex"
+#line 143 "wesnoth.flex"
 { continue; /* single-line comment */ }
 	YY_BREAK
 case 2:
 YY_RULE_SETUP
-#line 144 "wesnoth.flex"
+#line 145 "wesnoth.flex"
 {
         // node opener
         std::string foo = YYText();
@@ -739,7 +740,7 @@
 	YY_BREAK
 case 3:
 YY_RULE_SETUP
-#line 167 "wesnoth.flex"
+#line 168 "wesnoth.flex"
 {
         size_t & bracedepth = METADATA(internaldepth);
         if( bracedepth == BuilderContext::node_depth(this) )
@@ -760,24 +761,24 @@
 	YY_BREAK
 case 4:
 YY_RULE_SETUP
-#line 186 "wesnoth.flex"
+#line 187 "wesnoth.flex"
 {;}
 	YY_BREAK
 case 5:
 YY_RULE_SETUP
-#line 187 "wesnoth.flex"
+#line 188 "wesnoth.flex"
 {
         METADATA(property) += YYText();
 	}
 	YY_BREAK
 case 6:
 YY_RULE_SETUP
-#line 190 "wesnoth.flex"
+#line 191 "wesnoth.flex"
 {;} // swallow it
 	YY_BREAK
 case 7:
 YY_RULE_SETUP
-#line 191 "wesnoth.flex"
+#line 192 "wesnoth.flex"
 { // end of line
 	std::string pname;
 	std::string pval;
@@ -798,7 +799,7 @@
 	YY_BREAK
 case 8:
 YY_RULE_SETUP
-#line 210 "wesnoth.flex"
+#line 211 "wesnoth.flex"
 {
         // read property
 	if( METADATA(internaldepth) != BuilderContext::node_depth(this) ) { return 1; }
@@ -808,12 +809,12 @@
 	YY_BREAK
 case 9:
 YY_RULE_SETUP
-#line 218 "wesnoth.flex"
+#line 219 "wesnoth.flex"
 {;}
 	YY_BREAK
 case 10:
 YY_RULE_SETUP
-#line 220 "wesnoth.flex"
+#line 221 "wesnoth.flex"
 ECHO;
 	YY_BREAK
 case YY_STATE_EOF(INITIAL):
@@ -1626,7 +1627,7 @@
 	return 0;
 	}
 #endif
-#line 220 "wesnoth.flex"
+#line 221 "wesnoth.flex"
 
 
 #undef METADATA

Modified: trunk/src/s11n/vappendf.cpp
===================================================================
--- trunk/src/s11n/vappendf.cpp	2010-06-09 19:43:37 UTC (rev 285)
+++ trunk/src/s11n/vappendf.cpp	2010-06-09 19:54:35 UTC (rev 286)
@@ -23,7 +23,7 @@
 #include <string.h> /* strlen() */
 #include <stdlib.h> /* free/malloc() */
 #include <ctype.h>
-
+#include <stdio.h> /* sprintf(), fwrite() */
 #include <s11n.net/s11n/vappendf.hpp>
 
 #ifdef __cplusplus


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.