diff options
| author | eb <eb@221aa14e-8319-0410-a670-987f0aec2ac5> | 2007-05-02 04:03:32 +0000 |
|---|---|---|
| committer | eb <eb@221aa14e-8319-0410-a670-987f0aec2ac5> | 2007-05-02 04:03:32 +0000 |
| commit | 28259329a829f157fd877a1c14139eaf0117dabd (patch) | |
| tree | 607721f6e313051be211a738a20fcd79391c5787 /gnuradio-core/src/lib | |
| parent | 2972cb29e206e2c0ed2d5e8283d2d1864126da08 (diff) | |
cleaned up some warnings
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@5220 221aa14e-8319-0410-a670-987f0aec2ac5
Diffstat (limited to 'gnuradio-core/src/lib')
| -rw-r--r-- | gnuradio-core/src/lib/gengen/gr_sig_source_X.cc.t | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/gnuradio-core/src/lib/gengen/gr_sig_source_X.cc.t b/gnuradio-core/src/lib/gengen/gr_sig_source_X.cc.t index 4357eedf44..5b8a7bfd58 100644 --- a/gnuradio-core/src/lib/gengen/gr_sig_source_X.cc.t +++ b/gnuradio-core/src/lib/gengen/gr_sig_source_X.cc.t @@ -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(); } |