summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorJohnathan Corgan2012-06-11 09:47:47 -0700
committerJohnathan Corgan2012-06-11 09:47:47 -0700
commit926f7cba99c4fa3906853e11ff4e91eea93a5a53 (patch)
tree23df2c822d887e4b6b8c68c9ca8b99766d8ab7a8 /docs
parent6260c4263231718c81770916c2574f8d395d10d6 (diff)
parent92ce6ff434763c8c9360c23435e715e19681b346 (diff)
downloadgnuradio-926f7cba99c4fa3906853e11ff4e91eea93a5a53.tar.gz
gnuradio-926f7cba99c4fa3906853e11ff4e91eea93a5a53.tar.bz2
gnuradio-926f7cba99c4fa3906853e11ff4e91eea93a5a53.zip
Merge commit 'v3.6.1' into wip/gr-blocks-master
Diffstat (limited to 'docs')
-rw-r--r--docs/doxygen/other/volk_guide.dox2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/doxygen/other/volk_guide.dox b/docs/doxygen/other/volk_guide.dox
index 24882ed1a..0e444ebba 100644
--- a/docs/doxygen/other/volk_guide.dox
+++ b/docs/doxygen/other/volk_guide.dox
@@ -63,7 +63,7 @@ calls with:
\code
const int alignment_multiple =
volk_get_alignment() / output_item_size;
- set_alignment(alignment_multiple);
+ set_alignment(std::max(1,alignment_multiple));
\endcode
The Volk function 'volk_get_alignment' provides the alignment of the