[Commit-gnuradio] [gnuradio] 03/03: Merge remote-tracking branch 'nwest/volk_slicer'

[git]

This is an automated email from the git hooks/post-receive script.

jcorgan pushed a commit to branch master
in repository gnuradio.

commit ad9b5476be6e9a27638dfb9b3dbe5ca2c6a65fee
Merge: 80ec147 fd1e916
Author: Johnathan Corgan <address@hidden>
Date:   Fri Jun 13 16:41:47 2014 -0700

    Merge remote-tracking branch 'nwest/volk_slicer'

 volk/apps/volk_profile.cc                      |   1 +
 volk/kernels/volk/volk_32f_binary_slicer_32i.h | 241 +++++++++++++++++++++++++
 volk/lib/testqa.cc                             |   1 +
 3 files changed, 243 insertions(+)

diff --cc volk/lib/testqa.cc
index f4d6348,41093d2..fc54b35
--- a/volk/lib/testqa.cc
+++ b/volk/lib/testqa.cc
@@@ -110,5 -88,5 +110,6 @@@ VOLK_RUN_TESTS(volk_32f_x2_multiply_32f
  VOLK_RUN_TESTS(volk_32fc_s32fc_multiply_32fc, 1e-4, 0, 20462, 1);
  VOLK_RUN_TESTS(volk_32f_s32f_multiply_32f, 1e-4, 0, 20462, 1);
  VOLK_RUN_TESTS(volk_32fc_s32fc_rotatorpuppet_32fc, 1e-3, 
(lv_32fc_t)lv_cmake(0.953939201, 0.3), 20462, 1);
 +VOLK_RUN_TESTS(volk_8u_conv_k7_r2puppet_8u, 0, 0, 2060, 1);
  VOLK_RUN_TESTS(volk_32f_invsqrt_32f, 1e-2, 0, 20462, 1);
+ VOLK_RUN_TESTS(volk_32f_binary_slicer_32i, 0, 0, 20462, 1);