removed some warnings

git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@9475 221aa14e-8319-0410-a670-987f0aec2ac5

diff --git a/gnuradio-core/src/lib/general/gr_align_on_samplenumbers_ss.cc b/gnuradio-core/src/lib/general/gr_align_on_samplenumbers_ss.cc
index 906a72c4ce6fedb44c0571e87d256de7daebbac2..38d18b736659e2ae075ea46684e1d2b86290d00e 100644 (file)
--- a/gnuradio-core/src/lib/general/gr_align_on_samplenumbers_ss.cc
+++ b/gnuradio-core/src/lib/general/gr_align_on_samplenumbers_ss.cc
@@ -331,7 +331,7 @@ gr_align_on_samplenumbers_ss::general_work (int noutput_items,
     x_high16bits = uin[d_nchan*2];
     x_low16bits = uin[d_nchan*2+1];
     unsigned int ucounter_begin2 = x_high16bits<<16 | x_low16bits;
-    if((d_state[i].ucounter_begin+1)!=(ucounter_begin2))
+    if((d_state[i].ucounter_begin+1)!=(ucounter_begin2)){
       if(ucounter_begin2==0)
       {
 #ifdef DEBUG_TOCONSUME
@@ -342,6 +342,7 @@ gr_align_on_samplenumbers_ss::general_work (int noutput_items,
       {
         ePrintf("Error: counter not continuous.\n ucounter_begin[%i]=%i +1 !=  ucounter_begin2=%i\n",i,d_state[i].ucounter_begin,ucounter_begin2);
       }
+    }
       
     //diff_comp[i]=ucounter[i]-ucounter[0];
     //diff_min=std::min(diff[i],diff_min);

diff --git a/gnuradio-core/src/lib/io/microtune_4702.cc b/gnuradio-core/src/lib/io/microtune_4702.cc
index 01fe450fd98f6343fcf5fbb327e9f5c9aeaa20d2..59c88e26eeccf626ae800e482a953add2b54fccc 100644 (file)
--- a/gnuradio-core/src/lib/io/microtune_4702.cc
+++ b/gnuradio-core/src/lib/io/microtune_4702.cc
@@ -151,7 +151,7 @@ microtune_4702::set_RF_freq (double target_freq, double *p_actual_freq)
   buf[0] = ((divisor & 0x07f00) >> 8) & 0xff;  // DB1
   buf[1] = divisor & 0xff;             // DB2
   buf[2] = control_byte_1 (d_prescaler, d_reference_divider);
-  buf[2] = (buf[2]|(((divisor & 0x18000) >> 10)) & 0xff);
+  buf[2] = buf[2] | (((divisor & 0x18000) >> 10) & 0xff);
   buf[3] = control_byte_2 (target_freq);
 
   printf ("%x\n", PLL_I2C_ADDR);