[Commit-gnuradio] r10334 - in gnuradio/branches/developers/michaelld/swigpythonargs: gnuradio-core/src/lib/filter gnuradio-core/src/lib/general gr-msdd6000/src gr-usrp/src

[michaelld]

Author: michaelld
Date: 2009-01-29 13:11:44 -0700 (Thu, 29 Jan 2009)
New Revision: 10334

Modified:
   
gnuradio/branches/developers/michaelld/swigpythonargs/gnuradio-core/src/lib/filter/gr_cma_equalizer_cc.i
   
gnuradio/branches/developers/michaelld/swigpythonargs/gnuradio-core/src/lib/general/gr_pwr_squelch_cc.i
   
gnuradio/branches/developers/michaelld/swigpythonargs/gnuradio-core/src/lib/general/gr_pwr_squelch_ff.i
   gnuradio/branches/developers/michaelld/swigpythonargs/gr-msdd6000/src/msdd.i
   gnuradio/branches/developers/michaelld/swigpythonargs/gr-usrp/src/usrp.i
Log:
Fixes SWIG warnings regarding unknown base class info.
Passes 'make check' on OSX on both SWIG 1.3.36 and 1.3.37.



Modified: 
gnuradio/branches/developers/michaelld/swigpythonargs/gnuradio-core/src/lib/filter/gr_cma_equalizer_cc.i
===================================================================
--- 
gnuradio/branches/developers/michaelld/swigpythonargs/gnuradio-core/src/lib/filter/gr_cma_equalizer_cc.i
    2009-01-29 06:20:41 UTC (rev 10333)
+++ 
gnuradio/branches/developers/michaelld/swigpythonargs/gnuradio-core/src/lib/filter/gr_cma_equalizer_cc.i
    2009-01-29 20:11:44 UTC (rev 10334)
@@ -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,cma_equalizer_cc)
 
-%include <gr_adaptive_fir_ccf.i>
+// retrieve info on the base class, without generating wrappers since
+// the base class has a pure virual method.
+%import "gr_adaptive_fir_ccf.i"
 
 gr_cma_equalizer_cc_sptr gr_make_cma_equalizer_cc(int num_taps, float modulus, 
float mu);
 

Modified: 
gnuradio/branches/developers/michaelld/swigpythonargs/gnuradio-core/src/lib/general/gr_pwr_squelch_cc.i
===================================================================
--- 
gnuradio/branches/developers/michaelld/swigpythonargs/gnuradio-core/src/lib/general/gr_pwr_squelch_cc.i
     2009-01-29 06:20:41 UTC (rev 10333)
+++ 
gnuradio/branches/developers/michaelld/swigpythonargs/gnuradio-core/src/lib/general/gr_pwr_squelch_cc.i
     2009-01-29 20:11:44 UTC (rev 10334)
@@ -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);

Modified: 
gnuradio/branches/developers/michaelld/swigpythonargs/gnuradio-core/src/lib/general/gr_pwr_squelch_ff.i
===================================================================
--- 
gnuradio/branches/developers/michaelld/swigpythonargs/gnuradio-core/src/lib/general/gr_pwr_squelch_ff.i
     2009-01-29 06:20:41 UTC (rev 10333)
+++ 
gnuradio/branches/developers/michaelld/swigpythonargs/gnuradio-core/src/lib/general/gr_pwr_squelch_ff.i
     2009-01-29 20:11:44 UTC (rev 10334)
@@ -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);

Modified: 
gnuradio/branches/developers/michaelld/swigpythonargs/gr-msdd6000/src/msdd.i
===================================================================
--- 
gnuradio/branches/developers/michaelld/swigpythonargs/gr-msdd6000/src/msdd.i    
    2009-01-29 06:20:41 UTC (rev 10333)
+++ 
gnuradio/branches/developers/michaelld/swigpythonargs/gr-msdd6000/src/msdd.i    
    2009-01-29 20:11:44 UTC (rev 10334)
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2004 Free Software Foundation, Inc.
+ * Copyright 2004,2009 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -22,16 +22,13 @@
 
 %feature("autodoc", "1");              // generate python docstrings
 
-%include "exception.i"
-%import "gnuradio.i"                           // the common stuff
+%import(module="gnuradio_swig_py_runtime") "gnuradio.i"        // the common 
stuff
 
 %{
-
 #include "gnuradio_swig_bug_workaround.h"      // mandatory bug fix
 #include "msdd_source_s.h"
 #include "msdd_source_c.h"
 #include "msdd_source_simple.h"
-#include <stdexcept>
 %}
 
 // ================================================================

Modified: 
gnuradio/branches/developers/michaelld/swigpythonargs/gr-usrp/src/usrp.i
===================================================================
--- gnuradio/branches/developers/michaelld/swigpythonargs/gr-usrp/src/usrp.i    
2009-01-29 06:20:41 UTC (rev 10333)
+++ gnuradio/branches/developers/michaelld/swigpythonargs/gr-usrp/src/usrp.i    
2009-01-29 20:11:44 UTC (rev 10334)
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2008 Free Software Foundation, Inc.
+ * Copyright 2008,2009 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -22,12 +22,10 @@
 
 %feature("autodoc", "1");              // generate python docstrings
 
-%include "exception.i"
-%import "gnuradio.i"                           // the common stuff
+%import(module="gnuradio_swig_py_runtime") "gnuradio.i"        // the common 
stuff
 
 %{
 #include "gnuradio_swig_bug_workaround.h"      // mandatory bug fix
-#include <stdexcept>
 #include <vector>
 %}