wok diff par2/stuff/par2cmdline-0.4-gcc4.patch @ rev 10413
zlib: DON'T SCREW UP TAZwOK COOKORDER. THIS IS NEEDED FOR COOK-TOOLCHAIN TO WORK.
author | Christopher Rogers <slaxemulator@gmail.com> |
---|---|
date | Tue May 24 07:31:47 2011 +0000 (2011-05-24) |
parents | |
children |
line diff
1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 1.2 +++ b/par2/stuff/par2cmdline-0.4-gcc4.patch Tue May 24 07:31:47 2011 +0000 1.3 @@ -0,0 +1,62 @@ 1.4 +Fix compilation with gcc-4. 1.5 + 1.6 +Patch by Dirk-Jan Heijs. 1.7 + 1.8 +http://bugs.gentoo.org/102391 1.9 +http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=287904 1.10 + 1.11 +--- par2cmdline-0.4/reedsolomon.cpp 1.12 ++++ par2cmdline-0.4/reedsolomon.cpp 1.13 +@@ -51,7 +51,7 @@ 1.14 + } 1.15 + } 1.16 + 1.17 +-bool ReedSolomon<Galois8>::SetInput(const vector<bool> &present) 1.18 ++template <> bool ReedSolomon<Galois8>::SetInput(const vector<bool> &present) 1.19 + { 1.20 + inputcount = (u32)present.size(); 1.21 + 1.22 +@@ -80,7 +80,7 @@ 1.23 + return true; 1.24 + } 1.25 + 1.26 +-bool ReedSolomon<Galois8>::SetInput(u32 count) 1.27 ++template <> bool ReedSolomon<Galois8>::SetInput(u32 count) 1.28 + { 1.29 + inputcount = count; 1.30 + 1.31 +@@ -101,7 +101,7 @@ 1.32 + return true; 1.33 + } 1.34 + 1.35 +-bool ReedSolomon<Galois8>::Process(size_t size, u32 inputindex, const void *inputbuffer, u32 outputindex, void *outputbuffer) 1.36 ++template <> bool ReedSolomon<Galois8>::Process(size_t size, u32 inputindex, const void *inputbuffer, u32 outputindex, void *outputbuffer) 1.37 + { 1.38 + // Look up the appropriate element in the RS matrix 1.39 + Galois8 factor = leftmatrix[outputindex * (datapresent + datamissing) + inputindex]; 1.40 +@@ -189,7 +189,7 @@ 1.41 + 1.42 + // Set which of the source files are present and which are missing 1.43 + // and compute the base values to use for the vandermonde matrix. 1.44 +-bool ReedSolomon<Galois16>::SetInput(const vector<bool> &present) 1.45 ++template <> bool ReedSolomon<Galois16>::SetInput(const vector<bool> &present) 1.46 + { 1.47 + inputcount = (u32)present.size(); 1.48 + 1.49 +@@ -233,7 +233,7 @@ 1.50 + 1.51 + // Record that the specified number of source files are all present 1.52 + // and compute the base values to use for the vandermonde matrix. 1.53 +-bool ReedSolomon<Galois16>::SetInput(u32 count) 1.54 ++template <> bool ReedSolomon<Galois16>::SetInput(u32 count) 1.55 + { 1.56 + inputcount = count; 1.57 + 1.58 +@@ -267,7 +267,7 @@ 1.59 + return true; 1.60 + } 1.61 + 1.62 +-bool ReedSolomon<Galois16>::Process(size_t size, u32 inputindex, const void *inputbuffer, u32 outputindex, void *outputbuffer) 1.63 ++template <> bool ReedSolomon<Galois16>::Process(size_t size, u32 inputindex, const void *inputbuffer, u32 outputindex, void *outputbuffer) 1.64 + { 1.65 + // Look up the appropriate element in the RS matrix