Use size_t over int for vlen.

git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10599 221aa14e-8319-0410-a670-987f0aec2ac5

diff --git a/gnuradio-core/src/lib/general/gr_float_to_complex.cc b/gnuradio-core/src/lib/general/gr_float_to_complex.cc
index 077a498ae8473974d6dd115777b682e1d61add2d..af878231a6a98617d928cdd8bdc2176e157fdde9 100644 (file)
--- a/gnuradio-core/src/lib/general/gr_float_to_complex.cc
+++ b/gnuradio-core/src/lib/general/gr_float_to_complex.cc
@@ -28,12 +28,12 @@
 #include <gr_io_signature.h>
 
 gr_float_to_complex_sptr
 #include <gr_io_signature.h>
 
 gr_float_to_complex_sptr

-gr_make_float_to_complex (int vlen)
+gr_make_float_to_complex (size_t vlen)

 {
   return gr_float_to_complex_sptr (new gr_float_to_complex (vlen));
 }
 
 {
   return gr_float_to_complex_sptr (new gr_float_to_complex (vlen));
 }
 

-gr_float_to_complex::gr_float_to_complex (int vlen)
+gr_float_to_complex::gr_float_to_complex (size_t vlen)

   : gr_sync_block ("gr_float_to_complex",
                   gr_make_io_signature (1, 2, sizeof (float) *  vlen),
                   gr_make_io_signature (1, 1, sizeof (gr_complex) * vlen)),
   : gr_sync_block ("gr_float_to_complex",
                   gr_make_io_signature (1, 2, sizeof (float) *  vlen),
                   gr_make_io_signature (1, 1, sizeof (gr_complex) * vlen)),

diff --git a/gnuradio-core/src/lib/general/gr_float_to_complex.h b/gnuradio-core/src/lib/general/gr_float_to_complex.h
index 4a394092902c0036ca8094b345534555414ad301..0c82d72093f20fa462128b95fac8f6a17e079918 100644 (file)
--- a/gnuradio-core/src/lib/general/gr_float_to_complex.h
+++ b/gnuradio-core/src/lib/general/gr_float_to_complex.h
@@ -30,7 +30,7 @@ class gr_float_to_complex;
 typedef boost::shared_ptr<gr_float_to_complex> gr_float_to_complex_sptr;
 
 gr_float_to_complex_sptr
 typedef boost::shared_ptr<gr_float_to_complex> gr_float_to_complex_sptr;
 
 gr_float_to_complex_sptr

-gr_make_float_to_complex (int vlen = 1);
+gr_make_float_to_complex (size_t vlen = 1);

 
 /*!
  * \brief Convert 1 or 2 streams of float to a stream of gr_complex
 
 /*!
  * \brief Convert 1 or 2 streams of float to a stream of gr_complex


@@ -39,10 +39,10 @@ gr_make_float_to_complex (int vlen = 1);
 
 class gr_float_to_complex : public gr_sync_block
 {
 
 class gr_float_to_complex : public gr_sync_block
 {

-  friend gr_float_to_complex_sptr gr_make_float_to_complex (int vlen);
-  gr_float_to_complex (int vlen);
+  friend gr_float_to_complex_sptr gr_make_float_to_complex (size_t vlen);
+  gr_float_to_complex (size_t vlen);

 
 

-  int d_vlen;
+  size_t d_vlen;

 
  public:
   virtual int work (int noutput_items,
 
  public:
   virtual int work (int noutput_items,

diff --git a/gnuradio-core/src/lib/general/gr_float_to_complex.i b/gnuradio-core/src/lib/general/gr_float_to_complex.i
index 71e59a8c82a5c769abb86175178e5d29c7917df2..5ed48533e5cfa50be668c1393e2ea63938ec8a3d 100644 (file)
--- a/gnuradio-core/src/lib/general/gr_float_to_complex.i
+++ b/gnuradio-core/src/lib/general/gr_float_to_complex.i
@@ -22,9 +22,9 @@
 
 GR_SWIG_BLOCK_MAGIC(gr,float_to_complex)
 
 
 GR_SWIG_BLOCK_MAGIC(gr,float_to_complex)
 

-gr_float_to_complex_sptr gr_make_float_to_complex (int vlen = 1);
+gr_float_to_complex_sptr gr_make_float_to_complex (size_t vlen = 1);

 
 class gr_float_to_complex : public gr_sync_block
 {
 
 class gr_float_to_complex : public gr_sync_block
 {

-  gr_float_to_complex (int vlen);
+  gr_float_to_complex (size_t vlen);

 };
 };

diff --git a/gnuradio-core/src/lib/gengen/gr_divide_XX.cc.t b/gnuradio-core/src/lib/gengen/gr_divide_XX.cc.t
index 9fc6d34e919b4f91ea7f2c84444a547de0867baa..2db490f135ad129849f4ecad57089f9778b22a9d 100644 (file)
--- a/gnuradio-core/src/lib/gengen/gr_divide_XX.cc.t
+++ b/gnuradio-core/src/lib/gengen/gr_divide_XX.cc.t
@@ -30,12 +30,12 @@
 #include <gr_io_signature.h>
 
 @SPTR_NAME@
 #include <gr_io_signature.h>
 
 @SPTR_NAME@

-gr_make_@BASE_NAME@ (int vlen)
+gr_make_@BASE_NAME@ (size_t vlen)

 {
   return @SPTR_NAME@ (new @NAME@ (vlen));
 }
 
 {
   return @SPTR_NAME@ (new @NAME@ (vlen));
 }
 

-@NAME@::@NAME@ (int vlen)
+@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_sync_block ("@BASE_NAME@",
                   gr_make_io_signature (1, -1, sizeof (@I_TYPE@)*vlen),
                   gr_make_io_signature (1,  1, sizeof (@O_TYPE@)*vlen)),

diff --git a/gnuradio-core/src/lib/gengen/gr_divide_XX.h.t b/gnuradio-core/src/lib/gengen/gr_divide_XX.h.t
index 1489986b9fe7b2fa1e2b41f6340c3322662d88bb..c5b7871618d7e23c4aa895f8b55f93996a152e3b 100644 (file)
--- a/gnuradio-core/src/lib/gengen/gr_divide_XX.h.t
+++ b/gnuradio-core/src/lib/gengen/gr_divide_XX.h.t
@@ -30,7 +30,7 @@
 class @NAME@;
 typedef boost::shared_ptr<@NAME@> @SPTR_NAME@;
 
 class @NAME@;
 typedef boost::shared_ptr<@NAME@> @SPTR_NAME@;
 

-@SPTR_NAME@ gr_make_@BASE_NAME@ (int vlen = 1);
+@SPTR_NAME@ gr_make_@BASE_NAME@ (size_t vlen = 1);

 
 /*!
  * \brief output = input_0 / input_1 / input_x ...)
 
 /*!
  * \brief output = input_0 / input_1 / input_x ...)


@@ -40,11 +40,11 @@ typedef boost::shared_ptr<@NAME@> @SPTR_NAME@;
  */
 class @NAME@ : public gr_sync_block
 {
  */
 class @NAME@ : public gr_sync_block
 {

-  friend @SPTR_NAME@ gr_make_@BASE_NAME@ (int vlen);
+  friend @SPTR_NAME@ gr_make_@BASE_NAME@ (size_t vlen);

 
 

-  @NAME@ (int vlen);
+  @NAME@ (size_t vlen);

 
 

-  int d_vlen;
+  size_t d_vlen;

 
  public:
 
 
  public:
 

diff --git a/gnuradio-core/src/lib/gengen/gr_divide_XX.i.t b/gnuradio-core/src/lib/gengen/gr_divide_XX.i.t
index f07481a8bbd005b41e0bc85b1bd95e86e9030fbf..f7726ccf67362cc0fb18c746e56db78be9443058 100644 (file)
--- a/gnuradio-core/src/lib/gengen/gr_divide_XX.i.t
+++ b/gnuradio-core/src/lib/gengen/gr_divide_XX.i.t
@@ -24,10 +24,10 @@
 
 GR_SWIG_BLOCK_MAGIC(gr,@BASE_NAME@)
 
 
 GR_SWIG_BLOCK_MAGIC(gr,@BASE_NAME@)
 

-@SPTR_NAME@ gr_make_@BASE_NAME@ (int vlen = 1);
+@SPTR_NAME@ gr_make_@BASE_NAME@ (size_t vlen = 1);

 
 class @NAME@ : public gr_sync_block
 {
  private:
 
 class @NAME@ : public gr_sync_block
 {
  private:

-  @NAME@ (int vlen);
+  @NAME@ (size_t vlen);

 };
 };

diff --git a/gnuradio-core/src/lib/gengen/gr_sub_XX.cc.t b/gnuradio-core/src/lib/gengen/gr_sub_XX.cc.t
index 93895fed65175c6a3a2c9fd703fca48e4f694717..5d6b3022da4ac15a0ede3fcbba1783a1b7a3a39d 100644 (file)
--- a/gnuradio-core/src/lib/gengen/gr_sub_XX.cc.t
+++ b/gnuradio-core/src/lib/gengen/gr_sub_XX.cc.t
@@ -30,12 +30,12 @@
 #include <gr_io_signature.h>
 
 @SPTR_NAME@
 #include <gr_io_signature.h>
 
 @SPTR_NAME@

-gr_make_@BASE_NAME@ (int vlen)
+gr_make_@BASE_NAME@ (size_t vlen)

 {
   return @SPTR_NAME@ (new @NAME@ (vlen));
 }
 
 {
   return @SPTR_NAME@ (new @NAME@ (vlen));
 }
 

-@NAME@::@NAME@ (int vlen)
+@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_sync_block ("@BASE_NAME@",
                   gr_make_io_signature (1, -1, sizeof (@I_TYPE@)*vlen),
                   gr_make_io_signature (1,  1, sizeof (@O_TYPE@)*vlen))

diff --git a/gnuradio-core/src/lib/gengen/gr_sub_XX.h.t b/gnuradio-core/src/lib/gengen/gr_sub_XX.h.t
index d251e676879faecbb50e87f02d1480a51dba5331..2ba7023caed375109d4dd89e3921099e9bf69513 100644 (file)
--- a/gnuradio-core/src/lib/gengen/gr_sub_XX.h.t
+++ b/gnuradio-core/src/lib/gengen/gr_sub_XX.h.t
@@ -30,7 +30,7 @@
 class @NAME@;
 typedef boost::shared_ptr<@NAME@> @SPTR_NAME@;
 
 class @NAME@;
 typedef boost::shared_ptr<@NAME@> @SPTR_NAME@;
 

-@SPTR_NAME@ gr_make_@BASE_NAME@ (int vlen = 1);
+@SPTR_NAME@ gr_make_@BASE_NAME@ (size_t vlen = 1);

 
 /*!
  * \brief output = input_0 -  input_1 - ...)
 
 /*!
  * \brief output = input_0 -  input_1 - ...)


@@ -40,11 +40,11 @@ typedef boost::shared_ptr<@NAME@> @SPTR_NAME@;
  */
 class @NAME@ : public gr_sync_block
 {
  */
 class @NAME@ : public gr_sync_block
 {

-  friend @SPTR_NAME@ gr_make_@BASE_NAME@ (int vlen);
+  friend @SPTR_NAME@ gr_make_@BASE_NAME@ (size_t vlen);

 
 

-  @NAME@ (int vlen);
+  @NAME@ (size_t vlen);

 
 

-  int d_vlen;
+  size_t d_vlen;

 
  public:
 
 
  public:
 

diff --git a/gnuradio-core/src/lib/gengen/gr_sub_XX.i.t b/gnuradio-core/src/lib/gengen/gr_sub_XX.i.t
index f07481a8bbd005b41e0bc85b1bd95e86e9030fbf..f7726ccf67362cc0fb18c746e56db78be9443058 100644 (file)
--- a/gnuradio-core/src/lib/gengen/gr_sub_XX.i.t
+++ b/gnuradio-core/src/lib/gengen/gr_sub_XX.i.t
@@ -24,10 +24,10 @@
 
 GR_SWIG_BLOCK_MAGIC(gr,@BASE_NAME@)
 
 
 GR_SWIG_BLOCK_MAGIC(gr,@BASE_NAME@)
 

-@SPTR_NAME@ gr_make_@BASE_NAME@ (int vlen = 1);
+@SPTR_NAME@ gr_make_@BASE_NAME@ (size_t vlen = 1);

 
 class @NAME@ : public gr_sync_block
 {
  private:
 
 class @NAME@ : public gr_sync_block
 {
  private:

-  @NAME@ (int vlen);
+  @NAME@ (size_t vlen);

 };
 };