]> git.gag.com Git - debian/gnuradio/commitdiff
cleaned up some warnings
authoreb <eb@221aa14e-8319-0410-a670-987f0aec2ac5>
Wed, 2 May 2007 04:03:32 +0000 (04:03 +0000)
committereb <eb@221aa14e-8319-0410-a670-987f0aec2ac5>
Wed, 2 May 2007 04:03:32 +0000 (04:03 +0000)
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@5220 221aa14e-8319-0410-a670-987f0aec2ac5

gnuradio-core/src/lib/gengen/gr_sig_source_X.cc.t

index 4357eedf44c63f29d4632e7ce6bb1ed073dfd388..5b8a7bfd5893ad2c89fd9ea0d1e4056228f14da4 100644 (file)
@@ -181,19 +181,19 @@ int
   /* The triangle wave rises from -PI to 0 and falls from 0 to PI.     */ 
   case GR_TRI_WAVE:    
     for (int i = 0; i < noutput_items; i++){
-      t = (@TYPE@) d_ampl*d_nco.get_phase()/M_PI;
-        if (d_nco.get_phase() < 0)
-          optr[i] = t + d_ampl + d_offset;
-        else
-          optr[i] = -1*t + d_ampl + d_offset;
-        d_nco.step();
+      double t = d_ampl*d_nco.get_phase()/M_PI;
+      if (d_nco.get_phase() < 0)
+       optr[i] = static_cast<@TYPE@>(t + d_ampl + d_offset);
+      else
+       optr[i] = static_cast<@TYPE@>(-1*t + d_ampl + d_offset);
+      d_nco.step();
     }
     break;
        
   /* The saw tooth wave rises from -PI to PI.  */
   case GR_SAW_WAVE:    
     for (int i = 0; i < noutput_items; i++){
-      t = (@TYPE@) d_ampl*d_nco.get_phase()/(2*M_PI) + d_ampl/2 + d_offset;
+      t = static_cast<@TYPE@>(d_ampl*d_nco.get_phase()/(2*M_PI) + d_ampl/2 + d_offset);
       optr[i] = t;             
       d_nco.step();
     }