diff options
| author | Johnathan Corgan | 2012-02-26 15:43:24 -0800 |
|---|---|---|
| committer | Johnathan Corgan | 2012-02-26 15:43:24 -0800 |
| commit | 399bf08bf0b61f599001c990d3c0cfd24cc368f6 (patch) | |
| tree | 0f918ba1ec155ef3072df21ea094892d93aecadd | |
| parent | 49bba6365830b1ec66caa28c67be49d2ab091d9e (diff) | |
| parent | 314bc60002eb8a2e7a8ac351057bbaf8387fc467 (diff) | |
| download | gnuradio-399bf08bf0b61f599001c990d3c0cfd24cc368f6.tar.gz gnuradio-399bf08bf0b61f599001c990d3c0cfd24cc368f6.tar.bz2 gnuradio-399bf08bf0b61f599001c990d3c0cfd24cc368f6.zip | |
Merge branch 'master' into next
| -rw-r--r-- | gnuradio-core/src/lib/runtime/gr_sync_decimator.h | 2 | ||||
| -rw-r--r-- | gnuradio-core/src/lib/runtime/gr_sync_interpolator.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/gnuradio-core/src/lib/runtime/gr_sync_decimator.h b/gnuradio-core/src/lib/runtime/gr_sync_decimator.h index b2ed3c4fe..7228d3655 100644 --- a/gnuradio-core/src/lib/runtime/gr_sync_decimator.h +++ b/gnuradio-core/src/lib/runtime/gr_sync_decimator.h @@ -38,7 +38,7 @@ class GR_CORE_API gr_sync_decimator : public gr_sync_block unsigned d_decimation; protected: - + gr_sync_decimator (void){} //allows pure virtual interface sub-classes gr_sync_decimator (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_interpolator.h b/gnuradio-core/src/lib/runtime/gr_sync_interpolator.h index d65b3da1e..c332a5272 100644 --- a/gnuradio-core/src/lib/runtime/gr_sync_interpolator.h +++ b/gnuradio-core/src/lib/runtime/gr_sync_interpolator.h @@ -38,6 +38,7 @@ class GR_CORE_API gr_sync_interpolator : public gr_sync_block unsigned d_interpolation; protected: + gr_sync_interpolator (void){} //allows pure virtual interface sub-classes gr_sync_interpolator (const std::string &name, gr_io_signature_sptr input_signature, gr_io_signature_sptr output_signature, |