diff options
author | jblum | 2009-03-14 17:44:54 +0000 |
---|---|---|
committer | jblum | 2009-03-14 17:44:54 +0000 |
commit | 44f01e6d551ed19ee28ef2b6ff60c470ec439f9c (patch) | |
tree | 70724c533a343080d67c4694c24bb98c3f45977b /gnuradio-core/src/lib | |
parent | 7d0955ef7bc7a41855ca3301976c6616981fa27e (diff) | |
download | gnuradio-44f01e6d551ed19ee28ef2b6ff60c470ec439f9c.tar.gz gnuradio-44f01e6d551ed19ee28ef2b6ff60c470ec439f9c.tar.bz2 gnuradio-44f01e6d551ed19ee28ef2b6ff60c470ec439f9c.zip |
Use size_t over int for vlen.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10599 221aa14e-8319-0410-a670-987f0aec2ac5
Diffstat (limited to 'gnuradio-core/src/lib')
-rw-r--r-- | gnuradio-core/src/lib/general/gr_float_to_complex.cc | 4 | ||||
-rw-r--r-- | gnuradio-core/src/lib/general/gr_float_to_complex.h | 8 | ||||
-rw-r--r-- | gnuradio-core/src/lib/general/gr_float_to_complex.i | 4 | ||||
-rw-r--r-- | gnuradio-core/src/lib/gengen/gr_divide_XX.cc.t | 4 | ||||
-rw-r--r-- | gnuradio-core/src/lib/gengen/gr_divide_XX.h.t | 8 | ||||
-rw-r--r-- | gnuradio-core/src/lib/gengen/gr_divide_XX.i.t | 4 | ||||
-rw-r--r-- | gnuradio-core/src/lib/gengen/gr_sub_XX.cc.t | 4 | ||||
-rw-r--r-- | gnuradio-core/src/lib/gengen/gr_sub_XX.h.t | 8 | ||||
-rw-r--r-- | gnuradio-core/src/lib/gengen/gr_sub_XX.i.t | 4 |
9 files changed, 24 insertions, 24 deletions
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 077a498ae..af878231a 100644 --- 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 -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)); } -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)), 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 4a3940929..0c82d7209 100644 --- 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 -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 @@ -39,10 +39,10 @@ gr_make_float_to_complex (int vlen = 1); 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, 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 71e59a8c8..5ed48533e 100644 --- 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_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 { - 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 9fc6d34e9..2db490f13 100644 --- 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@ -gr_make_@BASE_NAME@ (int vlen) +gr_make_@BASE_NAME@ (size_t 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)), 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 1489986b9..c5b787161 100644 --- 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@; -@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 ...) @@ -40,11 +40,11 @@ typedef boost::shared_ptr<@NAME@> @SPTR_NAME@; */ 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: 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 f07481a8b..f7726ccf6 100644 --- 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@) -@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: - @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 93895fed6..5d6b3022d 100644 --- 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@ -gr_make_@BASE_NAME@ (int vlen) +gr_make_@BASE_NAME@ (size_t 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)) 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 d251e6768..2ba7023ca 100644 --- 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@; -@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 - ...) @@ -40,11 +40,11 @@ typedef boost::shared_ptr<@NAME@> @SPTR_NAME@; */ 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: 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 f07481a8b..f7726ccf6 100644 --- 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@) -@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: - @NAME@ (int vlen); + @NAME@ (size_t vlen); }; |