diff options
| author | Tom Rondeau | 2011-06-13 12:35:42 -0400 |
|---|---|---|
| committer | Tom Rondeau | 2011-06-13 12:35:42 -0400 |
| commit | 5ce630cbce6460b739b175257ce0d717095a55f4 (patch) | |
| tree | cabaca9d47ca1959f5e2861801a0ab160fe0be11 /gr-trellis/src/lib/trellis_viterbi_combined_XX.h.t | |
| parent | 86553ec410b1074bc4258b22027c5d31443d12ec (diff) | |
| parent | f0143c5d557ca7e4bf05c26f410da13520df91e5 (diff) | |
| download | gnuradio-5ce630cbce6460b739b175257ce0d717095a55f4.tar.gz gnuradio-5ce630cbce6460b739b175257ce0d717095a55f4.tar.bz2 gnuradio-5ce630cbce6460b739b175257ce0d717095a55f4.zip | |
Merge branch 'master' into 8psk
Conflicts:
gr-qtgui/lib/qtgui_time_sink_c.cc
gr-trellis/src/lib/Makefile.am
gr-trellis/src/lib/calc_metric.h
gr-trellis/src/lib/trellis.i
gr-trellis/src/lib/trellis_constellation_metrics_cf.i
gr-trellis/src/lib/trellis_metric_type.h
gr-trellis/src/lib/trellis_sccc_encoder_XX.i.t
Diffstat (limited to 'gr-trellis/src/lib/trellis_viterbi_combined_XX.h.t')
| -rw-r--r-- | gr-trellis/src/lib/trellis_viterbi_combined_XX.h.t | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/gr-trellis/src/lib/trellis_viterbi_combined_XX.h.t b/gr-trellis/src/lib/trellis_viterbi_combined_XX.h.t index 21307d0e3..35e6c4ce0 100644 --- a/gr-trellis/src/lib/trellis_viterbi_combined_XX.h.t +++ b/gr-trellis/src/lib/trellis_viterbi_combined_XX.h.t @@ -27,7 +27,8 @@ #include "fsm.h" #include <gr_block.h> -#include "trellis_calc_metric.h" +#include "calc_metric.h" +#include "core_algorithms.h" class @NAME@; typedef boost::shared_ptr<@NAME@> @SPTR_NAME@; |