diff options
| author | Johnathan Corgan <jcorgan@corganenterprises.com> | 2012-03-18 13:31:15 -0700 |
|---|---|---|
| committer | Johnathan Corgan <jcorgan@corganenterprises.com> | 2012-03-18 13:31:15 -0700 |
| commit | 70c625e9cec45bb8d2c31a0d3db0068c529f39fb (patch) | |
| tree | 7b02dbdf118113e11c30f18b3206c58585b1ed37 | |
| parent | 2273c29ef83f420b69c233e8c59a190786965256 (diff) | |
| parent | c138b94fbd3d9e7931e643b1bcbac56e80e8d4ae (diff) | |
Merge branch 'master' into next
| -rw-r--r-- | gnuradio-core/src/lib/runtime/gr_hier_block2.h | 1 | ||||
| -rw-r--r-- | gnuradio-core/src/python/gnuradio/gr/CMakeLists.txt | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/gnuradio-core/src/lib/runtime/gr_hier_block2.h b/gnuradio-core/src/lib/runtime/gr_hier_block2.h index 8687b7d99e..9652f6bf4d 100644 --- a/gnuradio-core/src/lib/runtime/gr_hier_block2.h +++ b/gnuradio-core/src/lib/runtime/gr_hier_block2.h @@ -55,6 +55,7 @@ private: gr_hier_block2_detail *d_detail; protected: + gr_hier_block2 (void){} //allows pure virtual interface sub-classes gr_hier_block2(const std::string &name, gr_io_signature_sptr input_signature, gr_io_signature_sptr output_signature); diff --git a/gnuradio-core/src/python/gnuradio/gr/CMakeLists.txt b/gnuradio-core/src/python/gnuradio/gr/CMakeLists.txt index 7b62a2f1e3..9129279216 100644 --- a/gnuradio-core/src/python/gnuradio/gr/CMakeLists.txt +++ b/gnuradio-core/src/python/gnuradio/gr/CMakeLists.txt @@ -47,6 +47,6 @@ foreach(py_qa_test_file ${py_qa_test_files}) ${CMAKE_BINARY_DIR}/gnuradio-core/src/lib/swig ) set(GR_TEST_TARGET_DEPS gruel gnuradio-core) - GR_ADD_TEST(${py_qa_test_name} ${PYTHON_EXECUTABLE} ${py_qa_test_file}) + GR_ADD_TEST(${py_qa_test_name} ${PYTHON_EXECUTABLE} ${PYTHON_DASH_B} ${py_qa_test_file}) endforeach(py_qa_test_file) endif(ENABLE_TESTING) |