[Commit-gnuradio] [gnuradio] 26/28: basic: use set_output_alignment in the basic math blocks

[git]

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

nwest pushed a commit to annotated tag gr_basic_work
in repository gnuradio.

commit f99d47faf347be0376478d01864c6f29d5ec4c50
Author: Josh Blum <address@hidden>
Date:   Tue Nov 15 13:10:07 2011 -0800

    basic: use set_output_alignment in the basic math blocks
---
 gr-basic/lib/gr_basic_add.cc            | 3 +--
 gr-basic/lib/gr_basic_multiply.cc       | 6 ++----
 gr-basic/lib/gr_basic_multiply_const.cc | 6 ++----
 3 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/gr-basic/lib/gr_basic_add.cc b/gr-basic/lib/gr_basic_add.cc
index 1d5c4dd..63cdb88 100644
--- a/gr-basic/lib/gr_basic_add.cc
+++ b/gr-basic/lib/gr_basic_add.cc
@@ -38,8 +38,7 @@ public:
         ),
         _vlen(vlen)
     {
-        const int alignment_multiple = volk_get_alignment() / 
(sizeof(float)*vlen);
-        set_output_multiple(std::max(1, alignment_multiple));
+        set_output_alignment(volk_get_alignment() / (sizeof(float)));
         //due to implementation, only first 2 ports can be inplaced
         this->set_inplace(true, 0);
         this->set_inplace(true, 1);
diff --git a/gr-basic/lib/gr_basic_multiply.cc 
b/gr-basic/lib/gr_basic_multiply.cc
index 30a3537..81dc2f6 100644
--- a/gr-basic/lib/gr_basic_multiply.cc
+++ b/gr-basic/lib/gr_basic_multiply.cc
@@ -38,8 +38,7 @@ public:
         ),
         _vlen(vlen)
     {
-        const int alignment_multiple = volk_get_alignment() / 
(sizeof(std::complex<float>)*vlen);
-        set_output_multiple(std::max(1, alignment_multiple));
+        set_output_alignment(volk_get_alignment() / 
(sizeof(std::complex<float>)*vlen));
         //due to implementation, only first 2 ports can be inplaced
         this->set_inplace(true, 0);
         this->set_inplace(true, 1);
@@ -80,8 +79,7 @@ public:
         ),
         _vlen(vlen)
     {
-        const int alignment_multiple = volk_get_alignment() / 
(sizeof(float)*vlen);
-        set_output_multiple(std::max(1, alignment_multiple));
+        set_output_alignment(volk_get_alignment() / (sizeof(float)*vlen));
         //due to implementation, only first 2 ports can be inplaced
         this->set_inplace(true, 0);
         this->set_inplace(true, 1);
diff --git a/gr-basic/lib/gr_basic_multiply_const.cc 
b/gr-basic/lib/gr_basic_multiply_const.cc
index 37f2575..2689941 100644
--- a/gr-basic/lib/gr_basic_multiply_const.cc
+++ b/gr-basic/lib/gr_basic_multiply_const.cc
@@ -51,8 +51,7 @@ public:
         )
     {
         _val.resize(1);
-        const int alignment_multiple = volk_get_alignment() / (sizeof(type));
-        set_output_multiple(std::max(1, alignment_multiple));
+        set_output_alignment(volk_get_alignment() / (sizeof(type)));
         this->set_inplace(true);
     }
 
@@ -96,8 +95,7 @@ public:
         )
     {
         _val.resize(1);
-        const int alignment_multiple = volk_get_alignment() / sizeof(type);
-        set_output_multiple(std::max(1, alignment_multiple));
+        set_output_alignment(volk_get_alignment() / (sizeof(type)));
         this->set_inplace(true);
     }