summaryrefslogtreecommitdiff
path: root/gnuradio-core/src/lib/general
diff options
context:
space:
mode:
authorjcorgan2009-02-02 14:27:28 +0000
committerjcorgan2009-02-02 14:27:28 +0000
commit8193fd8a044a18471a6091249195d15ae6d814be (patch)
treee9b491d81ad03024280209ac677d589c841b8f98 /gnuradio-core/src/lib/general
parent09f236be864aaa3b5216eb42676eafb38d47b587 (diff)
downloadgnuradio-8193fd8a044a18471a6091249195d15ae6d814be.tar.gz
gnuradio-8193fd8a044a18471a6091249195d15ae6d814be.tar.bz2
gnuradio-8193fd8a044a18471a6091249195d15ae6d814be.zip
Merged r10288:10370 from michaelld/swigpythonargs into trunk. Passes distcheck.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10371 221aa14e-8319-0410-a670-987f0aec2ac5
Diffstat (limited to 'gnuradio-core/src/lib/general')
-rw-r--r--gnuradio-core/src/lib/general/gr_pwr_squelch_cc.i6
-rw-r--r--gnuradio-core/src/lib/general/gr_pwr_squelch_ff.i6
2 files changed, 8 insertions, 4 deletions
diff --git a/gnuradio-core/src/lib/general/gr_pwr_squelch_cc.i b/gnuradio-core/src/lib/general/gr_pwr_squelch_cc.i
index 3d0e7f118..d2e8718c8 100644
--- a/gnuradio-core/src/lib/general/gr_pwr_squelch_cc.i
+++ b/gnuradio-core/src/lib/general/gr_pwr_squelch_cc.i
@@ -1,6 +1,6 @@
/* -*- c++ -*- */
/*
- * Copyright 2006 Free Software Foundation, Inc.
+ * Copyright 2006,2009 Free Software Foundation, Inc.
*
* This file is part of GNU Radio
*
@@ -22,7 +22,9 @@
GR_SWIG_BLOCK_MAGIC(gr,pwr_squelch_cc);
-%include gr_squelch_base_cc.i
+// retrieve info on the base class, without generating wrappers since
+// the base class has a pure virual method.
+%import "gr_squelch_base_cc.i"
gr_pwr_squelch_cc_sptr
gr_make_pwr_squelch_cc(double db, double alpha=0.0001, int ramp=0, bool gate=false);
diff --git a/gnuradio-core/src/lib/general/gr_pwr_squelch_ff.i b/gnuradio-core/src/lib/general/gr_pwr_squelch_ff.i
index 8c5919c95..4cb16c4ca 100644
--- a/gnuradio-core/src/lib/general/gr_pwr_squelch_ff.i
+++ b/gnuradio-core/src/lib/general/gr_pwr_squelch_ff.i
@@ -1,6 +1,6 @@
/* -*- c++ -*- */
/*
- * Copyright 2006 Free Software Foundation, Inc.
+ * Copyright 2006,2009 Free Software Foundation, Inc.
*
* This file is part of GNU Radio
*
@@ -22,7 +22,9 @@
GR_SWIG_BLOCK_MAGIC(gr,pwr_squelch_ff);
-%include gr_squelch_base_ff.i
+// retrieve info on the base class, without generating wrappers since
+// the base class has a pure virual method.
+%import "gr_squelch_base_ff.i"
gr_pwr_squelch_ff_sptr
gr_make_pwr_squelch_ff(double db, double alpha=0.0001, int ramp=0, bool gate=false);