diff options
author | Tom Rondeau | 2011-04-04 22:22:58 -0400 |
---|---|---|
committer | Tom Rondeau | 2011-04-04 22:22:58 -0400 |
commit | a43ea214e1ccf8dd8f4420198ecb67884d64de46 (patch) | |
tree | 696c985ac867549e2f535798f5ebe8fea8536ec6 /gnuradio-core/src/lib/runtime/gr_block.h | |
parent | 2653d20527b9c8b431b9bfcd396bc2a03a8a950b (diff) | |
parent | eca5501969aa6175562b7e70b350cf3e6ddec603 (diff) | |
download | gnuradio-a43ea214e1ccf8dd8f4420198ecb67884d64de46.tar.gz gnuradio-a43ea214e1ccf8dd8f4420198ecb67884d64de46.tar.bz2 gnuradio-a43ea214e1ccf8dd8f4420198ecb67884d64de46.zip |
Merge branch 'master' into qtgui
Diffstat (limited to 'gnuradio-core/src/lib/runtime/gr_block.h')
-rw-r--r-- | gnuradio-core/src/lib/runtime/gr_block.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gnuradio-core/src/lib/runtime/gr_block.h b/gnuradio-core/src/lib/runtime/gr_block.h index ad7fa9555..fc22f9ea8 100644 --- a/gnuradio-core/src/lib/runtime/gr_block.h +++ b/gnuradio-core/src/lib/runtime/gr_block.h @@ -236,7 +236,7 @@ class gr_block : public gr_basic_block { tag_propagation_policy_t d_tag_propagation_policy; // policy for moving tags downstream protected: - + gr_block (void){} //allows pure virtual interface sub-classes gr_block (const std::string &name, gr_io_signature_sptr input_signature, gr_io_signature_sptr output_signature); |