wok annotate par2/stuff/par2cmdline-0.4-gcc4.patch @ rev 18396

open-vm-tools: only build modules
author Nathan Neulinger <nneul@neulinger.org>
date Sat Sep 19 02:27:00 2015 +0000 (2015-09-19)
parents
children
rev   line source
pascal@9280 1 Fix compilation with gcc-4.
pascal@9280 2
pascal@9280 3 Patch by Dirk-Jan Heijs.
pascal@9280 4
pascal@9280 5 http://bugs.gentoo.org/102391
pascal@9280 6 http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=287904
pascal@9280 7
pascal@9280 8 --- par2cmdline-0.4/reedsolomon.cpp
pascal@9280 9 +++ par2cmdline-0.4/reedsolomon.cpp
pascal@9280 10 @@ -51,7 +51,7 @@
pascal@9280 11 }
pascal@9280 12 }
pascal@9280 13
pascal@9280 14 -bool ReedSolomon<Galois8>::SetInput(const vector<bool> &present)
pascal@9280 15 +template <> bool ReedSolomon<Galois8>::SetInput(const vector<bool> &present)
pascal@9280 16 {
pascal@9280 17 inputcount = (u32)present.size();
pascal@9280 18
pascal@9280 19 @@ -80,7 +80,7 @@
pascal@9280 20 return true;
pascal@9280 21 }
pascal@9280 22
pascal@9280 23 -bool ReedSolomon<Galois8>::SetInput(u32 count)
pascal@9280 24 +template <> bool ReedSolomon<Galois8>::SetInput(u32 count)
pascal@9280 25 {
pascal@9280 26 inputcount = count;
pascal@9280 27
pascal@9280 28 @@ -101,7 +101,7 @@
pascal@9280 29 return true;
pascal@9280 30 }
pascal@9280 31
pascal@9280 32 -bool ReedSolomon<Galois8>::Process(size_t size, u32 inputindex, const void *inputbuffer, u32 outputindex, void *outputbuffer)
pascal@9280 33 +template <> bool ReedSolomon<Galois8>::Process(size_t size, u32 inputindex, const void *inputbuffer, u32 outputindex, void *outputbuffer)
pascal@9280 34 {
pascal@9280 35 // Look up the appropriate element in the RS matrix
pascal@9280 36 Galois8 factor = leftmatrix[outputindex * (datapresent + datamissing) + inputindex];
pascal@9280 37 @@ -189,7 +189,7 @@
pascal@9280 38
pascal@9280 39 // Set which of the source files are present and which are missing
pascal@9280 40 // and compute the base values to use for the vandermonde matrix.
pascal@9280 41 -bool ReedSolomon<Galois16>::SetInput(const vector<bool> &present)
pascal@9280 42 +template <> bool ReedSolomon<Galois16>::SetInput(const vector<bool> &present)
pascal@9280 43 {
pascal@9280 44 inputcount = (u32)present.size();
pascal@9280 45
pascal@9280 46 @@ -233,7 +233,7 @@
pascal@9280 47
pascal@9280 48 // Record that the specified number of source files are all present
pascal@9280 49 // and compute the base values to use for the vandermonde matrix.
pascal@9280 50 -bool ReedSolomon<Galois16>::SetInput(u32 count)
pascal@9280 51 +template <> bool ReedSolomon<Galois16>::SetInput(u32 count)
pascal@9280 52 {
pascal@9280 53 inputcount = count;
pascal@9280 54
pascal@9280 55 @@ -267,7 +267,7 @@
pascal@9280 56 return true;
pascal@9280 57 }
pascal@9280 58
pascal@9280 59 -bool ReedSolomon<Galois16>::Process(size_t size, u32 inputindex, const void *inputbuffer, u32 outputindex, void *outputbuffer)
pascal@9280 60 +template <> bool ReedSolomon<Galois16>::Process(size_t size, u32 inputindex, const void *inputbuffer, u32 outputindex, void *outputbuffer)
pascal@9280 61 {
pascal@9280 62 // Look up the appropriate element in the RS matrix