[patch] modified gcc-3.4 patch to match iscan-1.13.1

iscan-1.13.1-gcc-3.4.patch (text/plain), 1.16 KB, created by stephan on 2005-03-25 06:20:42 UTC

diff -urN iscan-1.13.1.orig/frontend/file-selector.cc iscan-1.13.1/frontend/file-selector.cc
--- iscan-1.13.1.orig/frontend/file-selector.cc	2004-12-27 08:43:48.000000000 +0100
+++ iscan-1.13.1/frontend/file-selector.cc	2005-03-25 14:29:27.692461246 +0100
@@ -163,9 +163,12 @@
   int size = 1;			// terminating { 0 } element
   for (int i = 0; 0 != _format[i].name; ++i)
     ++size;
-  _fmt = new (const format *)[size];
+  // _fmt = new (const format *)[size];
 				// okay, so we may waste a few
-
+  typedef const format *t1;
+  _fmt = new t1[size];
+  
+  
   int cnt = 0;
   int len = 0;
   for (int i = 0; i < size - 1; ++i)
diff -urN iscan-1.13.1.orig/lib/cfilebuf.cc iscan-1.13.1/lib/cfilebuf.cc
--- iscan-1.13.1.orig/lib/cfilebuf.cc	2004-11-02 03:13:18.000000000 +0100
+++ iscan-1.13.1/lib/cfilebuf.cc	2005-03-25 14:29:27.693461101 +0100
@@ -249,7 +249,7 @@
 // force a single location of code for compilation by explicit
 // template instantiation, avoiding all kinds of nasty linking
 // problems
-template basic_cfilebuf< char  >;
-template basic_cfilebuf<wchar_t>;
+template class basic_cfilebuf< char  >;
+template class basic_cfilebuf<wchar_t>;
 
 }	// namespace iscan