[Commit-gnuradio] [gnuradio] 03/05: fixed bug where aligning a pointer would fail when built for 64-bit arch.

[git]

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

jcorgan pushed a commit to branch maint
in repository gnuradio.

commit f2d5e94ba893f5ce215e4ea5c91648a41bb5d148
Author: gnieboer <address@hidden>
Date:   Fri Apr 29 00:03:04 2016 +0300

    fixed bug where aligning a pointer would fail when built for 64-bit arch.
---
 gr-filter/lib/fir_filter.cc             | 12 ++++++------
 gr-filter/lib/fir_filter_with_buffer.cc | 12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/gr-filter/lib/fir_filter.cc b/gr-filter/lib/fir_filter.cc
index 3ea3c8b..895c778 100644
--- a/gr-filter/lib/fir_filter.cc
+++ b/gr-filter/lib/fir_filter.cc
@@ -110,7 +110,7 @@ namespace gr {
       float
       fir_filter_fff::filter(const float input[])
       {
-       const float *ar = (float *)((unsigned long) input & ~(d_align-1));
+       const float *ar = (float *)((size_t) input & ~(d_align-1));
        unsigned al = input - ar;
 
        volk_32f_x2_dot_prod_32f_a(d_output, ar,
@@ -224,7 +224,7 @@ namespace gr {
       gr_complex
       fir_filter_ccf::filter(const gr_complex input[])
       {
-       const gr_complex *ar = (gr_complex *)((unsigned long) input & 
~(d_align-1));
+       const gr_complex *ar = (gr_complex *)((size_t) input & ~(d_align-1));
        unsigned al = input - ar;
 
        volk_32fc_32f_dot_prod_32fc_a(d_output, ar,
@@ -341,7 +341,7 @@ namespace gr {
       gr_complex
       fir_filter_fcc::filter(const float input[])
       {
-       const float *ar = (float *)((unsigned long) input & ~(d_align-1));
+       const float *ar = (float *)((size_t) input & ~(d_align-1));
        unsigned al = input - ar;
 
        volk_32fc_32f_dot_prod_32fc_a(d_output,
@@ -456,7 +456,7 @@ namespace gr {
       gr_complex
       fir_filter_ccc::filter(const gr_complex input[])
       {
-       const gr_complex *ar = (gr_complex *)((unsigned long) input & 
~(d_align-1));
+       const gr_complex *ar = (gr_complex *)((size_t) input & ~(d_align-1));
        unsigned al = input - ar;
 
        volk_32fc_x2_dot_prod_32fc_a(d_output, ar,
@@ -570,7 +570,7 @@ namespace gr {
       gr_complex
       fir_filter_scc::filter(const short input[])
       {
-       const short *ar = (short *)((unsigned long) input & ~(d_align-1));
+       const short *ar = (short *)((size_t) input & ~(d_align-1));
        unsigned al = input - ar;
 
        volk_16i_32fc_dot_prod_32fc_a(d_output, ar,
@@ -685,7 +685,7 @@ namespace gr {
       short
       fir_filter_fsf::filter(const float input[])
       {
-       const float *ar = (float *)((unsigned long) input & ~(d_align-1));
+       const float *ar = (float *)((size_t) input & ~(d_align-1));
        unsigned al = input - ar;
 
        volk_32f_x2_dot_prod_16i_a(d_output, ar,
diff --git a/gr-filter/lib/fir_filter_with_buffer.cc 
b/gr-filter/lib/fir_filter_with_buffer.cc
index 9d4dd3a..9198440 100644
--- a/gr-filter/lib/fir_filter_with_buffer.cc
+++ b/gr-filter/lib/fir_filter_with_buffer.cc
@@ -130,7 +130,7 @@ namespace gr {
        if(d_idx >= ntaps())
          d_idx = 0;
 
-       const float *ar = (float*)((unsigned long)(&d_buffer[d_idx]) & 
~(d_align-1));
+       const float *ar = (float*)((size_t)(&d_buffer[d_idx]) & ~(d_align-1));
        unsigned al = (&d_buffer[d_idx]) - ar;
 
        volk_32f_x2_dot_prod_32f_a(d_output, ar,
@@ -153,7 +153,7 @@ namespace gr {
            d_idx = 0;
        }
 
-       const float *ar = (float*)((unsigned long)(&d_buffer[d_idx]) & 
~(d_align-1));
+       const float *ar = (float*)((size_t)(&d_buffer[d_idx]) & ~(d_align-1));
        unsigned al = (&d_buffer[d_idx]) - ar;
 
        volk_32f_x2_dot_prod_32f_a(d_output, ar,
@@ -283,7 +283,7 @@ namespace gr {
        if(d_idx >= ntaps())
          d_idx = 0;
 
-       const gr_complex *ar = (gr_complex *)((unsigned long)(&d_buffer[d_idx]) 
& ~(d_align-1));
+       const gr_complex *ar = (gr_complex *)((size_t)(&d_buffer[d_idx]) & 
~(d_align-1));
        unsigned al = (&d_buffer[d_idx]) - ar;
 
        volk_32fc_x2_dot_prod_32fc_a(d_output, ar,
@@ -306,7 +306,7 @@ namespace gr {
            d_idx = 0;
        }
 
-       const gr_complex *ar = (gr_complex *)((unsigned long)(&d_buffer[d_idx]) 
& ~(d_align-1));
+       const gr_complex *ar = (gr_complex *)((size_t)(&d_buffer[d_idx]) & 
~(d_align-1));
        unsigned al = (&d_buffer[d_idx]) - ar;
 
        volk_32fc_x2_dot_prod_32fc_a(d_output, ar,
@@ -436,7 +436,7 @@ namespace gr {
        if(d_idx >= ntaps())
          d_idx = 0;
 
-       const gr_complex *ar = (gr_complex *)((unsigned long)(&d_buffer[d_idx]) 
& ~(d_align-1));
+       const gr_complex *ar = (gr_complex *)((size_t)(&d_buffer[d_idx]) & 
~(d_align-1));
        unsigned al = (&d_buffer[d_idx]) - ar;
 
        volk_32fc_32f_dot_prod_32fc_a(d_output, ar,
@@ -459,7 +459,7 @@ namespace gr {
            d_idx = 0;
        }
 
-       const gr_complex *ar = (gr_complex *)((unsigned long)(&d_buffer[d_idx]) 
& ~(d_align-1));
+       const gr_complex *ar = (gr_complex *)((size_t)(&d_buffer[d_idx]) & 
~(d_align-1));
        unsigned al = (&d_buffer[d_idx]) - ar;
 
        volk_32fc_32f_dot_prod_32fc_a(d_output, ar,