1 files changed, 12 insertions, 12 deletions

diff --git a/lib/block_produce.cpp b/lib/block_produce.cpp
index 584d3a3..31a91f7 100644
--- a/lib/block_produce.cpp
+++ b/lib/block_produce.cpp
@@ -23,12 +23,12 @@ void Block::produce(const size_t num_items)
 
 item_index_t Block::get_produced(const size_t which_output)
 {
-    return (*this)->block->stats.items_produced[which_output];
+    return (*this)->block_data->stats.items_produced[which_output];
 }
 
 SBuffer Block::get_output_buffer(const size_t which_output) const
 {
-    SBuffer &buff = (*this)->block->output_queues.front(which_output);
+    SBuffer &buff = (*this)->block_data->output_queues.front(which_output);
     //increment length to auto pop full buffer size,
     //when user doesnt call pop_output_buffer()
     buff.length = buff.get_actual_length();
@@ -37,7 +37,7 @@ SBuffer Block::get_output_buffer(const size_t which_output) const
 
 void Block::pop_output_buffer(const size_t which_output, const size_t num_bytes)
 {
-    (*this)->block->output_queues.front(which_output).length = num_bytes;
+    (*this)->block_data->output_queues.front(which_output).length = num_bytes;
 }
 
 void Block::post_output_buffer(const size_t which_output, const SBuffer &buffer)
@@ -50,20 +50,20 @@ GRAS_FORCE_INLINE void BlockActor::produce(const size_t i, const size_t items)
     #ifdef ITEM_CONSPROD
     std::cerr << name << " produce " << items << std::endl;
     #endif
-    SBuffer &buff = this->output_queues.front(i);
-    ASSERT((buff.length % output_configs[i].item_size) == 0);
-    this->stats.items_produced[i] += items;
-    const size_t bytes = items*this->output_configs[i].item_size;
+    SBuffer &buff = data->output_queues.front(i);
+    ASSERT((buff.length % data->output_configs[i].item_size) == 0);
+    data->stats.items_produced[i] += items;
+    const size_t bytes = items*data->output_configs[i].item_size;
     buff.length += bytes;
-    this->produce_outputs[i] = true;
+    data->produce_outputs[i] = true;
 }
 
 GRAS_FORCE_INLINE void BlockActor::produce_buffer(const size_t i, const SBuffer &buffer)
 {
-    this->output_queues.consume(i);
-    ASSERT((buffer.length % output_configs[i].item_size) == 0);
-    const size_t items = buffer.length/output_configs[i].item_size;
-    this->stats.items_produced[i] += items;
+    data->output_queues.consume(i);
+    ASSERT((buffer.length % data->output_configs[i].item_size) == 0);
+    const size_t items = buffer.length/data->output_configs[i].item_size;
+    data->stats.items_produced[i] += items;
     InputBufferMessage buff_msg;
     buff_msg.buffer = buffer;
     this->post_downstream(i, buff_msg);