diff options
author | Johnathan Corgan | 2012-06-10 11:25:02 -0700 |
---|---|---|
committer | Johnathan Corgan | 2012-06-10 11:25:02 -0700 |
commit | 6260c4263231718c81770916c2574f8d395d10d6 (patch) | |
tree | fd1efb4311e256381a62783d749acb39b74bb972 /gr-blocks | |
parent | 1dcce62a400a5d6674482dea2e917631923764fa (diff) | |
download | gnuradio-6260c4263231718c81770916c2574f8d395d10d6.tar.gz gnuradio-6260c4263231718c81770916c2574f8d395d10d6.tar.bz2 gnuradio-6260c4263231718c81770916c2574f8d395d10d6.zip |
blocks: copy alignment fix from maint
Diffstat (limited to 'gr-blocks')
-rw-r--r-- | gr-blocks/lib/add_ff_impl.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gr-blocks/lib/add_ff_impl.cc b/gr-blocks/lib/add_ff_impl.cc index 754618d96..83359ef80 100644 --- a/gr-blocks/lib/add_ff_impl.cc +++ b/gr-blocks/lib/add_ff_impl.cc @@ -44,7 +44,7 @@ namespace gr { { const int alignment_multiple = volk_get_alignment() / sizeof(float); - set_alignment(alignment_multiple); + set_alignment(std::max(1, alignment_multiple)); } int |