diff options
| author | Tom Rondeau | 2011-07-26 23:36:53 -0400 |
|---|---|---|
| committer | Tom Rondeau | 2011-07-26 23:36:53 -0400 |
| commit | 77589906a859cacabd502dbfe93a72889d3fa83c (patch) | |
| tree | d76560d881b87885d2078f2d204427269995abb4 /gr-trellis | |
| parent | 8cb0981894000e8239ee2425b4e99ded9841604a (diff) | |
| parent | 8e1f9ce7dde6ba00cdaf6df8f08a602e4a3843b5 (diff) | |
| download | gnuradio-77589906a859cacabd502dbfe93a72889d3fa83c.tar.gz gnuradio-77589906a859cacabd502dbfe93a72889d3fa83c.tar.bz2 gnuradio-77589906a859cacabd502dbfe93a72889d3fa83c.zip | |
Merge branch 'maint'
* maint:
doxygen: fixed doxygen warnings.
Fixed type warning.
Fixed warnings about doxygen format.
Fixed return warnings.
Fixed warnings about variable intialization order.
Conflicts:
volk/include/volk/volk_complex.h
Diffstat (limited to 'gr-trellis')
| -rw-r--r-- | gr-trellis/src/lib/trellis_pccc_decoder_X.h.t | 2 | ||||
| -rw-r--r-- | gr-trellis/src/lib/trellis_sccc_decoder_X.h.t | 2 | ||||
| -rw-r--r-- | gr-trellis/src/lib/trellis_sccc_decoder_combined_XX.h.t | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/gr-trellis/src/lib/trellis_pccc_decoder_X.h.t b/gr-trellis/src/lib/trellis_pccc_decoder_X.h.t index ff4b7a1f8..2a5b43df6 100644 --- a/gr-trellis/src/lib/trellis_pccc_decoder_X.h.t +++ b/gr-trellis/src/lib/trellis_pccc_decoder_X.h.t @@ -50,9 +50,9 @@ typedef boost::shared_ptr<@NAME@> @SPTR_NAME@; class @NAME@ : public gr_block { fsm d_FSM1; - fsm d_FSM2; int d_ST10; int d_ST1K; + fsm d_FSM2; int d_ST20; int d_ST2K; interleaver d_INTERLEAVER; diff --git a/gr-trellis/src/lib/trellis_sccc_decoder_X.h.t b/gr-trellis/src/lib/trellis_sccc_decoder_X.h.t index 3adb8a5b7..93c9ac9b8 100644 --- a/gr-trellis/src/lib/trellis_sccc_decoder_X.h.t +++ b/gr-trellis/src/lib/trellis_sccc_decoder_X.h.t @@ -50,9 +50,9 @@ typedef boost::shared_ptr<@NAME@> @SPTR_NAME@; class @NAME@ : public gr_block { fsm d_FSMo; - fsm d_FSMi; int d_STo0; int d_SToK; + fsm d_FSMi; int d_STi0; int d_STiK; interleaver d_INTERLEAVER; diff --git a/gr-trellis/src/lib/trellis_sccc_decoder_combined_XX.h.t b/gr-trellis/src/lib/trellis_sccc_decoder_combined_XX.h.t index 146c26516..225a07ffe 100644 --- a/gr-trellis/src/lib/trellis_sccc_decoder_combined_XX.h.t +++ b/gr-trellis/src/lib/trellis_sccc_decoder_combined_XX.h.t @@ -55,9 +55,9 @@ typedef boost::shared_ptr<@NAME@> @SPTR_NAME@; class @NAME@ : public gr_block { fsm d_FSMo; - fsm d_FSMi; int d_STo0; int d_SToK; + fsm d_FSMi; int d_STi0; int d_STiK; interleaver d_INTERLEAVER; |