[vsipl++] patch: fix merge conflicts

[Jules Bergmann]

Stefan Seefeld wrote:
> Jules Bergmann wrote:
>>> Indeed. Should I add my suggested change above to the patch before
>>> checking
>>> it in ?
>> Yes, that sounds good.  I suspect we'll have to do something different
>> if people ever start using multi-dim FFTs, but for now let's avoid the
>> copy.  -- Jules
> 
> Here is a new patch, incorporating the changes we discussed. 1D FFT as
> well as FFTM now use / require aligned blocks if the block size is a multiple
> of the alignment size (and thus individual rows operations can be vectorized).
> 
> (Since the patch is slightly more involved than I originally assumed, I'd
>  prefer another round of review.)
> 
> Thanks,
> 		Stefan

Stefan, this looks good.  I like the way you have made aligned/unaligned 
orthogonal in Fft_base.  Please check it in.

				thanks,
				-- Jules

-- 
Jules Bergmann
CodeSourcery
jules at codesourcery.com
(650) 331-3385 x705