From f1657258ccaa1b62d9ef8bd4d8e9b3cebf865b9c Mon Sep 17 00:00:00 2001
From: Bill Clark <saikou@vt.edu>
Date: Wed, 1 Apr 2015 16:29:52 -0400
Subject: gnuradio-runtime: modified buffer length types to size_t, moved
buffer length vectors into detail
---
gnuradio-runtime/include/gnuradio/hier_block2.h | 23 ++++++++++-------------
1 file changed, 10 insertions(+), 13 deletions(-)
(limited to 'gnuradio-runtime/include/gnuradio/hier_block2.h')
diff --git a/gnuradio-runtime/include/gnuradio/hier_block2.h b/gnuradio-runtime/include/gnuradio/hier_block2.h
index 9a3f113a50..18739d36c9 100644
--- a/gnuradio-runtime/include/gnuradio/hier_block2.h
+++ b/gnuradio-runtime/include/gnuradio/hier_block2.h
@@ -57,9 +57,6 @@ namespace gr {
*/
hier_block2_detail *d_detail;
- // Track output buffer min/max settings
- std::vector<long> d_max_output_buffer;
- std::vector<long> d_min_output_buffer;
protected:
hier_block2(void) {} // allows pure virtual interface sub-classes
@@ -177,32 +174,32 @@ namespace gr {
/*!
* \brief Returns max buffer size on output port \p i.
*/
- long max_output_buffer(size_t i=0);
+ size_t max_output_buffer(size_t i=0);
/*!
* \brief Sets max buffer size on all output ports.
*/
- void set_max_output_buffer(long max_output_buffer);
+ void set_max_output_buffer(size_t max_output_buffer);
/*!
* \brief Sets max buffer size on output port \p port.
*/
- void set_max_output_buffer(int port, long max_output_buffer);
+ void set_max_output_buffer(int port, size_t max_output_buffer);
/*!
* \brief Returns min buffer size on output port \p i.
*/
- long min_output_buffer(size_t i=0);
+ size_t min_output_buffer(size_t i=0);
/*!
* \brief Sets min buffer size on all output ports.
*/
- void set_min_output_buffer(long min_output_buffer);
+ void set_min_output_buffer(size_t min_output_buffer);
/*!
* \brief Sets min buffer size on output port \p port.
*/
- void set_min_output_buffer(int port, long min_output_buffer);
+ void set_min_output_buffer(int port, size_t min_output_buffer);
// This is a public method for ease of code organization, but should be
@@ -270,20 +267,20 @@ namespace gr {
std::vector<int> processor_affinity();
/*!
- * \brief Get if all block buffers should be set.
+ * \brief Get if all block min buffers should be set.
*
* \details this returns whether all the block min output buffers
* should be set or just the block ports connected to the hier ports.
*/
- bool set_all_min_output_buffer(void);
+ bool all_min_output_buffer_p(void);
/*!
- * \brief Get if all block buffers should be set.
+ * \brief Get if all block max buffers should be set.
*
* \details this returns whether all the block max output buffers
* should be set or just the block ports connected to the hier ports.
*/
- bool set_all_max_output_buffer(void);
+ bool all_max_output_buffer_p(void);
};
/*!
--
cgit v1.2.3