From b51a8ef31e2f7ac2a12bc61502f02fc39d98653e Mon Sep 17 00:00:00 2001 From: jperkin Date: Tue, 26 Feb 2013 19:25:02 +0000 Subject: Avoid 'error: call of overloaded is ambiguous' failures. --- meta-pkgs/gnuradio/distinfo | 9 +++++++- ...rc_lib_filter_gri__fft__filter__ccc__generic.cc | 15 ++++++++++++++ ...rc_lib_filter_gri__fft__filter__fff__generic.cc | 15 ++++++++++++++ ...radio-core_src_lib_general_ga__gr__fxpt__vco.cc | 24 ++++++++++++++++++++++ ...tch-gnuradio-core_src_lib_general_gr__firdes.cc | 15 ++++++++++++++ ...o-core_src_lib_general_gr__ofdm__frame__sink.cc | 15 ++++++++++++++ ...o-core_src_lib_general_gr__ofdm__mapper__bcv.cc | 15 ++++++++++++++ ...patch-gnuradio-core_src_tests_benchmark__vco.cc | 15 ++++++++++++++ 8 files changed, 122 insertions(+), 1 deletion(-) create mode 100644 meta-pkgs/gnuradio/patches/patch-gnuradio-core_src_lib_filter_gri__fft__filter__ccc__generic.cc create mode 100644 meta-pkgs/gnuradio/patches/patch-gnuradio-core_src_lib_filter_gri__fft__filter__fff__generic.cc create mode 100644 meta-pkgs/gnuradio/patches/patch-gnuradio-core_src_lib_general_ga__gr__fxpt__vco.cc create mode 100644 meta-pkgs/gnuradio/patches/patch-gnuradio-core_src_lib_general_gr__firdes.cc create mode 100644 meta-pkgs/gnuradio/patches/patch-gnuradio-core_src_lib_general_gr__ofdm__frame__sink.cc create mode 100644 meta-pkgs/gnuradio/patches/patch-gnuradio-core_src_lib_general_gr__ofdm__mapper__bcv.cc create mode 100644 meta-pkgs/gnuradio/patches/patch-gnuradio-core_src_tests_benchmark__vco.cc (limited to 'meta-pkgs') diff --git a/meta-pkgs/gnuradio/distinfo b/meta-pkgs/gnuradio/distinfo index b27201df8fc..20039c439c5 100644 --- a/meta-pkgs/gnuradio/distinfo +++ b/meta-pkgs/gnuradio/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.11 2013/01/23 18:56:32 wiz Exp $ +$NetBSD: distinfo,v 1.12 2013/02/26 19:25:02 jperkin Exp $ SHA1 (gnuradio-3.3.0.tar.gz) = 41d5c177b173ce73404f5fe539b013c82600f73f RMD160 (gnuradio-3.3.0.tar.gz) = ae83bd8a93deaf73d730e2af0d05c9ffc4c98520 @@ -14,10 +14,17 @@ SHA1 (patch-aj) = 046fb46567fcbef58143ac3eeb2d0f1fd905618e SHA1 (patch-ak) = c6d2d9289600a89cd425d1bab671b080888d9c04 SHA1 (patch-config_gr__lib64.m4) = 2263778dea1b8918033c175735f3134a6da80dc5 SHA1 (patch-config_gr__standalone.m4) = b571e9d69ad83ecb3b65daf955e1b526f92c9ed9 +SHA1 (patch-gnuradio-core_src_lib_filter_gri__fft__filter__ccc__generic.cc) = b10f17c5d375bc4b53d2633889aed5209cd7df0f +SHA1 (patch-gnuradio-core_src_lib_filter_gri__fft__filter__fff__generic.cc) = 1d4c2d8e1c70ab9c89274e36c1ead440773d64a2 SHA1 (patch-gnuradio-core_src_lib_filter_qa_gri_mmse_fir_interpolator_cc.cc) = cdfa5d89b5f5d9225468e2652248a6b6da5a36b2 +SHA1 (patch-gnuradio-core_src_lib_general_ga__gr__fxpt__vco.cc) = c2cc13c9ad13c515ee786dff09468fbe0a191489 +SHA1 (patch-gnuradio-core_src_lib_general_gr__firdes.cc) = 3b7961d398d12e6540445e9b8b93f45755caa3f4 SHA1 (patch-gnuradio-core_src_lib_general_gr__math.cc) = 81161e9576c3ec8259a20663eb991578f0ac40c3 +SHA1 (patch-gnuradio-core_src_lib_general_gr__ofdm__frame__sink.cc) = a79510940726a7d4812375ebdca58d0c29ff0fc0 +SHA1 (patch-gnuradio-core_src_lib_general_gr__ofdm__mapper__bcv.cc) = 74f8385b428540c7ec764f0841f4bedd130f99c3 SHA1 (patch-gnuradio-core_src_lib_io_gr__file__descriptor__sink.cc) = 4ac9818b722b5fc9175c4c19fb8a8126ddf48ed2 SHA1 (patch-gnuradio-core_src_lib_io_gr__file__descriptor__source.cc) = 54f4194ef35e206ef05a6dd35066037529250a57 SHA1 (patch-gnuradio-core_src_lib_io_ppio_ppdev.cc) = dd8a78c0d08c66fe4ee362e73c7be2d7c47d64bb +SHA1 (patch-gnuradio-core_src_tests_benchmark__vco.cc) = dd09bac9c9419fb8315d66830eedd703486fafd2 SHA1 (patch-usrp2_firmware_configure.ac) = b79c71afe3d84a15466e37e6ce858ee63c43b62e SHA1 (patch-usrp_host_swig_usrp_prims.i) = 2ff2f695a2ba8cb4237298be96833225f37cfec8 diff --git a/meta-pkgs/gnuradio/patches/patch-gnuradio-core_src_lib_filter_gri__fft__filter__ccc__generic.cc b/meta-pkgs/gnuradio/patches/patch-gnuradio-core_src_lib_filter_gri__fft__filter__ccc__generic.cc new file mode 100644 index 00000000000..7238393cf53 --- /dev/null +++ b/meta-pkgs/gnuradio/patches/patch-gnuradio-core_src_lib_filter_gri__fft__filter__ccc__generic.cc @@ -0,0 +1,15 @@ +$NetBSD: patch-gnuradio-core_src_lib_filter_gri__fft__filter__ccc__generic.cc,v 1.1 2013/02/26 19:25:02 jperkin Exp $ + +Avoid 'error: call of overloaded is ambiguous' failures. + +--- gnuradio-core/src/lib/filter/gri_fft_filter_ccc_generic.cc.orig 2010-06-01 05:04:08.000000000 +0000 ++++ gnuradio-core/src/lib/filter/gri_fft_filter_ccc_generic.cc +@@ -99,7 +99,7 @@ gri_fft_filter_ccc_generic::compute_size + { + int old_fftsize = d_fftsize; + d_ntaps = ntaps; +- d_fftsize = (int) (2 * pow(2.0, ceil(log(ntaps) / log(2)))); ++ d_fftsize = (int) (2 * pow(2.0, ceil(log((float)ntaps) / log((float)2)))); + d_nsamples = d_fftsize - d_ntaps + 1; + + if (0) diff --git a/meta-pkgs/gnuradio/patches/patch-gnuradio-core_src_lib_filter_gri__fft__filter__fff__generic.cc b/meta-pkgs/gnuradio/patches/patch-gnuradio-core_src_lib_filter_gri__fft__filter__fff__generic.cc new file mode 100644 index 00000000000..85b0dcb3f8f --- /dev/null +++ b/meta-pkgs/gnuradio/patches/patch-gnuradio-core_src_lib_filter_gri__fft__filter__fff__generic.cc @@ -0,0 +1,15 @@ +$NetBSD: patch-gnuradio-core_src_lib_filter_gri__fft__filter__fff__generic.cc,v 1.1 2013/02/26 19:25:02 jperkin Exp $ + +Avoid 'error: call of overloaded is ambiguous' failures. + +--- gnuradio-core/src/lib/filter/gri_fft_filter_fff_generic.cc.orig 2010-06-01 05:04:08.000000000 +0000 ++++ gnuradio-core/src/lib/filter/gri_fft_filter_fff_generic.cc +@@ -86,7 +86,7 @@ gri_fft_filter_fff_generic::compute_size + { + int old_fftsize = d_fftsize; + d_ntaps = ntaps; +- d_fftsize = (int) (2 * pow(2.0, ceil(log(ntaps) / log(2)))); ++ d_fftsize = (int) (2 * pow(2.0, ceil(log((float)ntaps) / log((float)2)))); + d_nsamples = d_fftsize - d_ntaps + 1; + + if (0) diff --git a/meta-pkgs/gnuradio/patches/patch-gnuradio-core_src_lib_general_ga__gr__fxpt__vco.cc b/meta-pkgs/gnuradio/patches/patch-gnuradio-core_src_lib_general_ga__gr__fxpt__vco.cc new file mode 100644 index 00000000000..3138c8bf4d7 --- /dev/null +++ b/meta-pkgs/gnuradio/patches/patch-gnuradio-core_src_lib_general_ga__gr__fxpt__vco.cc @@ -0,0 +1,24 @@ +$NetBSD: patch-gnuradio-core_src_lib_general_ga__gr__fxpt__vco.cc,v 1.1 2013/02/26 19:25:02 jperkin Exp $ + +Avoid 'error: call of overloaded is ambiguous' failures. + +--- gnuradio-core/src/lib/general/qa_gr_fxpt_vco.cc.orig 2010-06-02 00:57:52.000000000 +0000 ++++ gnuradio-core/src/lib/general/qa_gr_fxpt_vco.cc +@@ -53,7 +53,7 @@ qa_gr_fxpt_vco::t0 () + float input[SIN_COS_BLOCK_SIZE]; + + for (int i = 0; i < SIN_COS_BLOCK_SIZE; i++){ +- input[i] = sin(i); ++ input[i] = sin((float)i); + } + + for (int i = 0; i < SIN_COS_BLOCK_SIZE; i++){ +@@ -85,7 +85,7 @@ qa_gr_fxpt_vco::t1 () + double max_error = 0; + + for (int i = 0; i < SIN_COS_BLOCK_SIZE; i++){ +- input[i] = sin(i); ++ input[i] = sin((float)i); + } + + ref_vco.cos (ref_block, input, SIN_COS_BLOCK_SIZE, SIN_COS_K, SIN_COS_AMPL); diff --git a/meta-pkgs/gnuradio/patches/patch-gnuradio-core_src_lib_general_gr__firdes.cc b/meta-pkgs/gnuradio/patches/patch-gnuradio-core_src_lib_general_gr__firdes.cc new file mode 100644 index 00000000000..91282f41542 --- /dev/null +++ b/meta-pkgs/gnuradio/patches/patch-gnuradio-core_src_lib_general_gr__firdes.cc @@ -0,0 +1,15 @@ +$NetBSD: patch-gnuradio-core_src_lib_general_gr__firdes.cc,v 1.1 2013/02/26 19:25:02 jperkin Exp $ + +Avoid 'error: call of overloaded is ambiguous' failures. + +--- gnuradio-core/src/lib/general/gr_firdes.cc.orig 2010-06-02 00:57:52.000000000 +0000 ++++ gnuradio-core/src/lib/general/gr_firdes.cc +@@ -574,7 +574,7 @@ gr_firdes::gaussian (double gain, + vector taps(ntaps); + double scale = 0; + double dt = 1.0/spb; +- double s = 1.0/(sqrt(log(2)) / (2*M_PI*bt)); ++ double s = 1.0/(sqrt(log((float)2)) / (2*M_PI*bt)); + double t0 = -0.5 * ntaps; + double ts; + for(int i=0;i is ambiguous' failures. + +--- gnuradio-core/src/lib/general/gr_ofdm_frame_sink.cc.orig 2010-06-01 05:04:09.000000000 +0000 ++++ gnuradio-core/src/lib/general/gr_ofdm_frame_sink.cc +@@ -281,7 +281,7 @@ gr_ofdm_frame_sink::set_sym_value_out(co + + d_sym_position = sym_position; + d_sym_value_out = sym_value_out; +- d_nbits = (unsigned long)ceil(log10(d_sym_value_out.size()) / log10(2.0)); ++ d_nbits = (unsigned long)ceil(log10((double)d_sym_value_out.size()) / log10((float)2.0)); + + return true; + } diff --git a/meta-pkgs/gnuradio/patches/patch-gnuradio-core_src_lib_general_gr__ofdm__mapper__bcv.cc b/meta-pkgs/gnuradio/patches/patch-gnuradio-core_src_lib_general_gr__ofdm__mapper__bcv.cc new file mode 100644 index 00000000000..9ca004a346f --- /dev/null +++ b/meta-pkgs/gnuradio/patches/patch-gnuradio-core_src_lib_general_gr__ofdm__mapper__bcv.cc @@ -0,0 +1,15 @@ +$NetBSD: patch-gnuradio-core_src_lib_general_gr__ofdm__mapper__bcv.cc,v 1.1 2013/02/26 19:25:02 jperkin Exp $ + +Avoid 'error: call of overloaded is ambiguous' failures. + +--- gnuradio-core/src/lib/general/gr_ofdm_mapper_bcv.cc.orig 2010-06-01 05:04:09.000000000 +0000 ++++ gnuradio-core/src/lib/general/gr_ofdm_mapper_bcv.cc +@@ -113,7 +113,7 @@ gr_ofdm_mapper_bcv::gr_ofdm_mapper_bcv ( + throw std::invalid_argument("gr_ofdm_mapper_bcv: subcarriers allocated exceeds size of occupied carriers"); + } + +- d_nbits = (unsigned long)ceil(log10(d_constellation.size()) / log10(2.0)); ++ d_nbits = (unsigned long)ceil(log10((double)d_constellation.size()) / log10((float)2.0)); + } + + gr_ofdm_mapper_bcv::~gr_ofdm_mapper_bcv(void) diff --git a/meta-pkgs/gnuradio/patches/patch-gnuradio-core_src_tests_benchmark__vco.cc b/meta-pkgs/gnuradio/patches/patch-gnuradio-core_src_tests_benchmark__vco.cc new file mode 100644 index 00000000000..b13e1e79a26 --- /dev/null +++ b/meta-pkgs/gnuradio/patches/patch-gnuradio-core_src_tests_benchmark__vco.cc @@ -0,0 +1,15 @@ +$NetBSD: patch-gnuradio-core_src_tests_benchmark__vco.cc,v 1.1 2013/02/26 19:25:02 jperkin Exp $ + +Avoid 'error: call of overloaded is ambiguous' failures. + +--- gnuradio-core/src/tests/benchmark_vco.cc.orig 2010-06-02 00:57:53.000000000 +0000 ++++ gnuradio-core/src/tests/benchmark_vco.cc +@@ -63,7 +63,7 @@ benchmark (void test (float *x, const fl + // touch memory + memset(output, 0, BLOCK_SIZE*sizeof(float)); + for (int i = 0; i