5 files changed, 16 insertions, 17 deletions
diff --git a/gnuradio-runtime/lib/pmt/pmt_serialize.cc b/gnuradio-runtime/lib/pmt/pmt_serialize.cc
index 6147082a21..12a97b974c 100644
--- a/gnuradio-runtime/lib/pmt/pmt_serialize.cc
+++ b/gnuradio-runtime/lib/pmt/pmt_serialize.cc
@@ -297,7 +297,7 @@ serialize(pmt_t obj, std::streambuf &sb)
     }
 
     if(is_real(obj)) {
-      float i = to_double(obj);
+      double i = to_double(obj);
       ok = serialize_untagged_u8(PST_DOUBLE, sb);
       ok &= serialize_untagged_f64(i, sb);
       return ok;
diff --git a/gr-dtv/lib/dvbt/dvbt_inner_coder_impl.cc b/gr-dtv/lib/dvbt/dvbt_inner_coder_impl.cc
index 4f24f0258f..54d25e49ea 100644
--- a/gr-dtv/lib/dvbt/dvbt_inner_coder_impl.cc
+++ b/gr-dtv/lib/dvbt/dvbt_inner_coder_impl.cc
@@ -161,14 +161,13 @@ namespace gr {
       // We output one byte for a symbol of m bits
       // The out/in rate in bytes is: 8n/km (Bytes)
 
-      assert(d_ninput % 1);
-      assert(d_noutput % 1512);
+      assert(d_noutput % 1512 == 0);
 
       // Set output items multiple of 4
       set_output_multiple(4);
 
       // Set relative rate out/in
-      assert((d_noutput * d_k * d_m) % (d_ninput * 8 * d_n));
+      assert((d_noutput * d_k * d_m) % (d_ninput * 8 * d_n) == 0);
       set_relative_rate((float)(d_ninput * 8 * d_n) / (float)d_noutput * d_k * d_m);
 
       // calculate in and out block sizes
diff --git a/gr-dtv/lib/dvbt/dvbt_viterbi_decoder_impl.cc b/gr-dtv/lib/dvbt/dvbt_viterbi_decoder_impl.cc
index 3b0f9fddfb..8e22d8df5a 100644
--- a/gr-dtv/lib/dvbt/dvbt_viterbi_decoder_impl.cc
+++ b/gr-dtv/lib/dvbt/dvbt_viterbi_decoder_impl.cc
@@ -578,7 +578,7 @@ namespace gr {
        *
        * out/in rate is therefore km/8n in bytes
        */
-      assert((d_k * d_m) % (8 * d_n));
+      assert((d_k * d_m) % (8 * d_n) == 0);
       set_relative_rate((d_k * d_m) / (8 * d_n));
 
       assert ((d_bsize * d_n) % d_m == 0);
diff --git a/gr-filter/lib/fir_filter.cc b/gr-filter/lib/fir_filter.cc
index 3ea3c8b8f6..895c778076 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 9d4dd3a023..91984407e2 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,