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 | |
| 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')
| -rw-r--r-- | gnuradio-core/src/lib/runtime/gr_basic_block.h | 2 | ||||
| -rw-r--r-- | gnuradio-core/src/lib/runtime/gr_block.h | 2 | ||||
| -rw-r--r-- | gnuradio-core/src/lib/runtime/gr_sync_block.h | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/gnuradio-core/src/lib/runtime/gr_basic_block.h b/gnuradio-core/src/lib/runtime/gr_basic_block.h index ce7a1aa1d..3b0cd51dd 100644 --- a/gnuradio-core/src/lib/runtime/gr_basic_block.h +++ b/gnuradio-core/src/lib/runtime/gr_basic_block.h @@ -73,6 +73,8 @@ protected: long d_unique_id; vcolor d_color; + gr_basic_block(void){} //allows pure virtual interface sub-classes + //! Protected constructor prevents instantiation by non-derived classes gr_basic_block(const std::string &name, gr_io_signature_sptr input_signature, 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); diff --git a/gnuradio-core/src/lib/runtime/gr_sync_block.h b/gnuradio-core/src/lib/runtime/gr_sync_block.h index 3a5d89d19..c5a6a50f1 100644 --- a/gnuradio-core/src/lib/runtime/gr_sync_block.h +++ b/gnuradio-core/src/lib/runtime/gr_sync_block.h @@ -34,7 +34,7 @@ class gr_sync_block : public gr_block { protected: - + gr_sync_block (void){} //allows pure virtual interface sub-classes gr_sync_block (const std::string &name, gr_io_signature_sptr input_signature, gr_io_signature_sptr output_signature); |