[Commit-gnuradio] gr-error-correcting-codes ChangeLog src/lib/ecc...

[Eric Blossom]

CVSROOT:        /sources/gnuradio
Module name:    gr-error-correcting-codes
Changes by:     Eric Blossom <eb>       06/07/09 21:02:44

Modified files:
        .              : ChangeLog 
        src/lib        : ecc.i gr_streams_encode_convolutional.cc 
                         gr_streams_encode_convolutional.h 
                         gr_streams_encode_convolutional.i 

Log message:
        swigish fixes to access second constructor

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gr-error-correcting-codes/ChangeLog?cvsroot=gnuradio&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gr-error-correcting-codes/src/lib/ecc.i?cvsroot=gnuradio&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gr-error-correcting-codes/src/lib/gr_streams_encode_convolutional.cc?cvsroot=gnuradio&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gr-error-correcting-codes/src/lib/gr_streams_encode_convolutional.h?cvsroot=gnuradio&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gr-error-correcting-codes/src/lib/gr_streams_encode_convolutional.i?cvsroot=gnuradio&r1=1.2&r2=1.3

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnuradio/gr-error-correcting-codes/ChangeLog,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- ChangeLog   9 Jul 2006 15:37:00 -0000       1.2
+++ ChangeLog   9 Jul 2006 21:02:44 -0000       1.3
@@ -1,5 +1,8 @@
 2006-07-09  Eric Blossom  <address@hidden>
 
+       * src/lib/gr_streams_encode_convolutional.{h,cc,i}: fixes to
+       access second constructor via SWIG.
+
        * src/lib/libecc/code_metrics.cc: added missing include.
 
 2006-07-03  Michael Dickens  <address@hidden>

Index: src/lib/ecc.i
===================================================================
RCS file: /sources/gnuradio/gr-error-correcting-codes/src/lib/ecc.i,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- src/lib/ecc.i       9 Jul 2006 16:15:17 -0000       1.3
+++ src/lib/ecc.i       9 Jul 2006 21:02:44 -0000       1.4
@@ -35,27 +35,6 @@
 
 %}
 
-// same as "GR_SWIG_BLOCK_MAGIC_HELPER" except w/o the
-// "class NAME" & "typedef" statements.
-
-%define LOCAL_GR_SWIG_BLOCK_MAGIC_HELPER(PKG, NAME, BASE_NAME)
-%template(NAME ## _sptr) boost::shared_ptr<NAME>;
-%rename(BASE_NAME) PKG ## _make_ ## BASE_NAME;
-%inline {
-  gr_block_sptr NAME ## _block (NAME ## _sptr r)
-  {
-    return gr_block_sptr (r);
-  }
-}
-
-%pythoncode %{
-NAME ## _sptr.block = lambda self: NAME ## _block (self)
-NAME ## _sptr.__repr__ = lambda self: "<gr_block %s (%d)>" % (self.name(), 
self.unique_id ())
-%}
-
-%ignore NAME;
-%enddef
-
 %include "gr_streams_encode_convolutional.i"
 %include "gr_streams_encode_turbo.i"
 %include "gr_metrics_decode_viterbi_full_block.i"

Index: src/lib/gr_streams_encode_convolutional.cc
===================================================================
RCS file: 
/sources/gnuradio/gr-error-correcting-codes/src/lib/gr_streams_encode_convolutional.cc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- src/lib/gr_streams_encode_convolutional.cc  9 Jul 2006 16:15:17 -0000       
1.2
+++ src/lib/gr_streams_encode_convolutional.cc  9 Jul 2006 21:02:44 -0000       
1.3
@@ -49,7 +49,7 @@
                                          end_memory_state));
 }
 
-gr_streams_encode_convolutional_feedback_sptr 
+gr_streams_encode_convolutional_sptr 
 gr_make_streams_encode_convolutional_feedback
 (int frame_size_bits,
  int n_code_inputs,
@@ -60,7 +60,7 @@
  int start_memory_state,
  int end_memory_state)
 {
-  return gr_streams_encode_convolutional_feedback_sptr
+  return gr_streams_encode_convolutional_sptr
     (new gr_streams_encode_convolutional (frame_size_bits,
                                          n_code_inputs,
                                          n_code_outputs,

Index: src/lib/gr_streams_encode_convolutional.h
===================================================================
RCS file: 
/sources/gnuradio/gr-error-correcting-codes/src/lib/gr_streams_encode_convolutional.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- src/lib/gr_streams_encode_convolutional.h   9 Jul 2006 16:15:17 -0000       
1.2
+++ src/lib/gr_streams_encode_convolutional.h   9 Jul 2006 21:02:44 -0000       
1.3
@@ -70,10 +70,8 @@
  */
 
 class gr_streams_encode_convolutional;
-
 typedef boost::shared_ptr<gr_streams_encode_convolutional>
-gr_streams_encode_convolutional_sptr,
-  gr_streams_encode_convolutional_feedback_sptr;
+  gr_streams_encode_convolutional_sptr;
 
 gr_streams_encode_convolutional_sptr
 gr_make_streams_encode_convolutional
@@ -85,7 +83,7 @@
  int start_memory_state = 0,
  int end_memory_state = 0);
 
-gr_streams_encode_convolutional_feedback_sptr
+gr_streams_encode_convolutional_sptr
 gr_make_streams_encode_convolutional_feedback
 (int frame_size_bits,
  int n_code_inputs,
@@ -108,7 +106,7 @@
    int start_memory_state,
    int end_memory_state);
 
-  friend gr_streams_encode_convolutional_feedback_sptr
+  friend gr_streams_encode_convolutional_sptr
   gr_make_streams_encode_convolutional_feedback
   (int frame_size_bits,
    int n_code_inputs,

Index: src/lib/gr_streams_encode_convolutional.i
===================================================================
RCS file: 
/sources/gnuradio/gr-error-correcting-codes/src/lib/gr_streams_encode_convolutional.i,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- src/lib/gr_streams_encode_convolutional.i   9 Jul 2006 16:15:17 -0000       
1.2
+++ src/lib/gr_streams_encode_convolutional.i   9 Jul 2006 21:02:44 -0000       
1.3
@@ -22,12 +22,8 @@
 
 GR_SWIG_BLOCK_MAGIC(gr,streams_encode_convolutional);
 
-// corrected "class NAME" statement, which uses slightly different NAMEs
-
-typedef boost::shared_ptr<gr_streams_encode_convolutional>
-gr_streams_encode_convolutional_feedback_sptr;
-
-LOCAL_GR_SWIG_BLOCK_MAGIC(gr,streams_encode_convolutional_feedback);
+// Rename second constructor
+%rename(streams_encode_convolutional_feedback) 
gr_make_streams_encode_convolutional_feedback;
 
 // support vectors of these ... for use in the convolutional decoder
 // as well as Turbo Codes (both encoder and decoder).
@@ -46,7 +42,7 @@
  int start_memory_state = 0,
  int end_memory_state = 0);
 
-gr_streams_encode_convolutional_feedback_sptr
+gr_streams_encode_convolutional_sptr
 gr_make_streams_encode_convolutional_feedback
 (int block_size_bits,
  int n_code_inputs,