[Commit-gnuradio] r10627 - in gnuradio/branches/releases/3.2: . gnuradio-core/src/lib/gengen gnuradio-core/src/python/gnuradio/gr

[jcorgan]

Author: jcorgan
Date: 2009-03-16 08:25:40 -0600 (Mon, 16 Mar 2009)
New Revision: 10627

Modified:
   gnuradio/branches/releases/3.2/
   gnuradio/branches/releases/3.2/gnuradio-core/src/lib/gengen/gr_sub_XX.cc.t
   gnuradio/branches/releases/3.2/gnuradio-core/src/python/gnuradio/gr/pubsub.py
Log:
Applied changeset r10624 to release 3.2 branch.


Property changes on: gnuradio/branches/releases/3.2
___________________________________________________________________
Modified: svn:mergeinfo
   - /gnuradio/branches/developers/michaelld/am_swig_4:10555-10595
/gnuradio/branches/developers/michaelld/two_mods:10540-10546
/gnuradio/trunk:10356-10359,10481-10482,10497-10499,10506-10507,10511,10514,10521,10523-10524,10529,10531,10535,10537-10538,10550-10551,10556,10558-10560,10562-10563,10565,10574-10576,10578-10579,10581-10582,10585,10587,10596-10600,10623
   + /gnuradio/branches/developers/michaelld/am_swig_4:10555-10595
/gnuradio/branches/developers/michaelld/two_mods:10540-10546
/gnuradio/trunk:10356-10359,10481-10482,10497-10499,10506-10507,10511,10514,10521,10523-10524,10529,10531,10535,10537-10538,10550-10551,10556,10558-10560,10562-10563,10565,10574-10576,10578-10579,10581-10582,10585,10587,10596-10600,10623-10624

Modified: 
gnuradio/branches/releases/3.2/gnuradio-core/src/lib/gengen/gr_sub_XX.cc.t
===================================================================
--- gnuradio/branches/releases/3.2/gnuradio-core/src/lib/gengen/gr_sub_XX.cc.t  
2009-03-16 14:23:22 UTC (rev 10626)
+++ gnuradio/branches/releases/3.2/gnuradio-core/src/lib/gengen/gr_sub_XX.cc.t  
2009-03-16 14:25:40 UTC (rev 10627)
@@ -38,7 +38,8 @@
 @NAME@::@NAME@ (size_t vlen)
   : gr_sync_block ("@BASE_NAME@",
                   gr_make_io_signature (1, -1, sizeof (@I_TYPE@)*vlen),
-                  gr_make_io_signature (1,  1, sizeof (@O_TYPE@)*vlen))
+                  gr_make_io_signature (1,  1, sizeof (@O_TYPE@)*vlen)),
+    d_vlen (vlen)
 {
 }
 


Property changes on: 
gnuradio/branches/releases/3.2/gnuradio-core/src/python/gnuradio/gr/pubsub.py
___________________________________________________________________
Modified: svn:mergeinfo
   - 
/gnuradio/branches/developers/michaelld/two_mods/gr-wxgui/src/python/pubsub.py:10540-10546
/gnuradio/trunk/gnuradio-core/src/python/gnuradio/gr/pubsub.py:10576,10582,10587,10596-10599,10623
   + 
/gnuradio/branches/developers/michaelld/two_mods/gr-wxgui/src/python/pubsub.py:10540-10546
/gnuradio/trunk/gnuradio-core/src/python/gnuradio/gr/pubsub.py:10576,10582,10587,10596-10599,10623-10624