[Commit-gnuradio] r10041 - in gnuradio/branches/features/cppdb: . gr-usrp/apps gr-usrp/src usrp/host/lib/legacy

[jcorgan]

Author: jcorgan
Date: 2008-11-23 15:22:15 -0700 (Sun, 23 Nov 2008)
New Revision: 10041

Modified:
   gnuradio/branches/features/cppdb/Makefile.common
   gnuradio/branches/features/cppdb/gr-usrp/apps/
   gnuradio/branches/features/cppdb/gr-usrp/src/Makefile.am
   gnuradio/branches/features/cppdb/gr-usrp/src/usrp.i
   gnuradio/branches/features/cppdb/usrp/host/lib/legacy/db_base.i
Log:
Missed template instantiation and moved kwarg generation to whole Python API

Modified: gnuradio/branches/features/cppdb/Makefile.common
===================================================================
--- gnuradio/branches/features/cppdb/Makefile.common    2008-11-23 17:10:23 UTC 
(rev 10040)
+++ gnuradio/branches/features/cppdb/Makefile.common    2008-11-23 22:22:15 UTC 
(rev 10041)
@@ -56,7 +56,8 @@
 WITH_SWIG_INCLUDES = @with_SWIG_INCLUDES@
 
 # swig flags
-SWIGPYTHONFLAGS = -fvirtual -python -modern
+# -w511 turns off keyword argument warning
+SWIGPYTHONFLAGS = -fvirtual -python -modern -keyword -w511
 
 # How to link in the top-level omnithreads library from inside the tree
 OMNITHREAD_INCLUDES = @omnithread_INCLUDES@


Property changes on: gnuradio/branches/features/cppdb/gr-usrp/apps
___________________________________________________________________
Name: svn:ignore
   - Makefile
Makefile.in
.libs
.deps
usrp_test_tx
usrp_test_rx

   + Makefile
Makefile.in
.libs
.deps
usrp_siggen
usrp_test_rx


Modified: gnuradio/branches/features/cppdb/gr-usrp/src/Makefile.am
===================================================================
--- gnuradio/branches/features/cppdb/gr-usrp/src/Makefile.am    2008-11-23 
17:10:23 UTC (rev 10040)
+++ gnuradio/branches/features/cppdb/gr-usrp/src/Makefile.am    2008-11-23 
22:22:15 UTC (rev 10041)
@@ -115,7 +115,7 @@
        $(WITH_SWIG_INCLUDES)
 
 usrp_swig.cc usrp_swig.py: $(ALL_IFILES)
-       $(SWIG) $(SWIGPYTHONARGS) -keyword -module usrp_swig -o usrp_swig.cc 
$(srcdir)/usrp.i
+       $(SWIG) $(SWIGPYTHONARGS) -module usrp_swig -o usrp_swig.cc 
$(srcdir)/usrp.i
 
 noinst_PYTHON =        \
        qa_usrp.py                      

Modified: gnuradio/branches/features/cppdb/gr-usrp/src/usrp.i
===================================================================
--- gnuradio/branches/features/cppdb/gr-usrp/src/usrp.i 2008-11-23 17:10:23 UTC 
(rev 10040)
+++ gnuradio/branches/features/cppdb/gr-usrp/src/usrp.i 2008-11-23 22:22:15 UTC 
(rev 10041)
@@ -28,6 +28,7 @@
 %{
 #include "gnuradio_swig_bug_workaround.h"      // mandatory bug fix
 #include <stdexcept>
+#include <vector>
 %}
 
 %include <usrp_subdev_spec.h>

Modified: gnuradio/branches/features/cppdb/usrp/host/lib/legacy/db_base.i
===================================================================
--- gnuradio/branches/features/cppdb/usrp/host/lib/legacy/db_base.i     
2008-11-23 17:10:23 UTC (rev 10040)
+++ gnuradio/branches/features/cppdb/usrp/host/lib/legacy/db_base.i     
2008-11-23 22:22:15 UTC (rev 10041)
@@ -87,6 +87,8 @@
 typedef boost::shared_ptr<db_base> db_base_sptr;
 %template(db_base_sptr) boost::shared_ptr<db_base>;
 
+%template(db_base_sptr_vector) std::vector<db_base_sptr>;
+
 // Set better class name in Python
 // Enable freq_range and gain_range from public methods of class not 
implemented in C++
 // And create a dummy wrapper for backwards compatability with some of the 
example code