diff options
| author | Johnathan Corgan | 2012-03-01 17:02:07 -0800 |
|---|---|---|
| committer | Johnathan Corgan | 2012-03-01 17:02:07 -0800 |
| commit | 875f5185a7feecbb1d4a3426a443bd873b0abd4b (patch) | |
| tree | 92ab827d8b1d0b822c03eb480e29d0f47c9dd100 /gnuradio-core/src/lib/general/general.i | |
| parent | bc5494fc83721b22b5c6a94e1300e112d6269313 (diff) | |
| parent | 0a6f1494b8e462c13c8c48c69680832967ebec72 (diff) | |
| download | gnuradio-875f5185a7feecbb1d4a3426a443bd873b0abd4b.tar.gz gnuradio-875f5185a7feecbb1d4a3426a443bd873b0abd4b.tar.bz2 gnuradio-875f5185a7feecbb1d4a3426a443bd873b0abd4b.zip | |
Merge branch 'master' into next
Conflicts:
config/grc_volk.m4
gnuradio-core/src/guile/tests/gengen_ctors.test
gnuradio-core/src/lib/Makefile.am
gnuradio-core/src/lib/general/.gitignore
gnuradio-core/src/lib/general/Makefile.am
gnuradio-core/src/lib/gengen/.gitignore
gnuradio-core/src/python/gnuradio/gr/Makefile.am
volk/include/volk/Makefile.am
Diffstat (limited to 'gnuradio-core/src/lib/general/general.i')
| -rw-r--r-- | gnuradio-core/src/lib/general/general.i | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/gnuradio-core/src/lib/general/general.i b/gnuradio-core/src/lib/general/general.i index 5a701bf80..89738b01a 100644 --- a/gnuradio-core/src/lib/general/general.i +++ b/gnuradio-core/src/lib/general/general.i @@ -44,8 +44,10 @@ #include <gr_float_to_char.h> #include <gr_float_to_uchar.h> #include <gr_short_to_float.h> +#include <gr_short_to_char.h> #include <gr_int_to_float.h> #include <gr_char_to_float.h> +#include <gr_char_to_short.h> #include <gr_uchar_to_float.h> #include <gr_frequency_modulator_fc.h> #include <gr_phase_modulator_fc.h> @@ -104,6 +106,11 @@ #include <gr_diff_decoder_bb.h> #include <gr_framer_sink_1.h> #include <gr_map_bb.h> +#include <gr_multiply_cc.h> +#include <gr_multiply_ff.h> +#include <gr_multiply_const_cc.h> +#include <gr_multiply_const_ff.h> +#include <gr_multiply_conjugate_cc.h> #include <gr_feval.h> #include <gr_pwr_squelch_cc.h> #include <gr_pwr_squelch_ff.h> @@ -134,6 +141,7 @@ #include <gr_burst_tagger.h> #include <gr_cpm.h> #include <gr_correlate_access_code_tag_bb.h> +#include <gr_add_ff.h> %} %include "gri_control_loop.i" @@ -158,8 +166,10 @@ %include "gr_float_to_char.i" %include "gr_float_to_uchar.i" %include "gr_short_to_float.i" +%include "gr_short_to_char.i" %include "gr_int_to_float.i" %include "gr_char_to_float.i" +%include "gr_char_to_short.i" %include "gr_uchar_to_float.i" %include "gr_frequency_modulator_fc.i" %include "gr_phase_modulator_fc.i" @@ -218,6 +228,11 @@ %include "gr_diff_decoder_bb.i" %include "gr_framer_sink_1.i" %include "gr_map_bb.i" +%include "gr_multiply_cc.i" +%include "gr_multiply_ff.i" +%include "gr_multiply_const_cc.i" +%include "gr_multiply_const_ff.i" +%include "gr_multiply_conjugate_cc.i" %include "gr_feval.i" %include "gr_pwr_squelch_cc.i" %include "gr_pwr_squelch_ff.i" @@ -248,3 +263,4 @@ %include "gr_burst_tagger.i" %include "gr_cpm.i" %include "gr_correlate_access_code_tag_bb.i" +%include "gr_add_ff.i" |