diff options
| author | Johnathan Corgan | 2013-01-14 15:57:56 -0800 |
|---|---|---|
| committer | Johnathan Corgan | 2013-01-14 15:57:56 -0800 |
| commit | 45657c97c05763f0b8d1531493ff3d1be923d21a (patch) | |
| tree | 1ae33447429ee53b5c4be4780438290d8798af31 | |
| parent | d1d210da036af0723c15d1c1f85fbacebe456bb5 (diff) | |
| parent | 5099198a501d7ef22a8cbfecfd410cf3619a36c5 (diff) | |
| download | gnuradio-45657c97c05763f0b8d1531493ff3d1be923d21a.tar.gz gnuradio-45657c97c05763f0b8d1531493ff3d1be923d21a.tar.bz2 gnuradio-45657c97c05763f0b8d1531493ff3d1be923d21a.zip | |
Merge branch 'maint'
| -rw-r--r-- | gnuradio-core/src/lib/io/gr_socket_pdu.h | 1 | ||||
| -rw-r--r-- | gnuradio-core/src/python/gnuradio/gr/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | gr-blocks/lib/file_source_impl.h | 1 |
3 files changed, 2 insertions, 7 deletions
diff --git a/gnuradio-core/src/lib/io/gr_socket_pdu.h b/gnuradio-core/src/lib/io/gr_socket_pdu.h index e30a4cc6c..2fedb317d 100644 --- a/gnuradio-core/src/lib/io/gr_socket_pdu.h +++ b/gnuradio-core/src/lib/io/gr_socket_pdu.h @@ -30,6 +30,7 @@ #include <gr_stream_pdu_base.h> #include <boost/array.hpp> #include <boost/asio.hpp> +#include <iostream> class gr_socket_pdu; typedef boost::shared_ptr<gr_socket_pdu> gr_socket_pdu_sptr; diff --git a/gnuradio-core/src/python/gnuradio/gr/CMakeLists.txt b/gnuradio-core/src/python/gnuradio/gr/CMakeLists.txt index 62f3d7e46..bd78c8fb4 100644 --- a/gnuradio-core/src/python/gnuradio/gr/CMakeLists.txt +++ b/gnuradio-core/src/python/gnuradio/gr/CMakeLists.txt @@ -43,13 +43,6 @@ include(GrTest) file(GLOB py_qa_test_files "qa_*.py") foreach(py_qa_test_file ${py_qa_test_files}) get_filename_component(py_qa_test_name ${py_qa_test_file} NAME_WE) - set(GR_TEST_PYTHON_DIRS - ${CMAKE_SOURCE_DIR}/gruel/src/python - ${CMAKE_BINARY_DIR}/gruel/src/swig - ${CMAKE_BINARY_DIR}/gnuradio-core/src/python - ${CMAKE_BINARY_DIR}/gnuradio-core/src/lib/swig - ) - set(GR_TEST_TARGET_DEPS volk gruel gnuradio-core) GR_ADD_TEST(${py_qa_test_name} ${PYTHON_EXECUTABLE} ${PYTHON_DASH_B} ${py_qa_test_file}) endforeach(py_qa_test_file) endif(ENABLE_TESTING) diff --git a/gr-blocks/lib/file_source_impl.h b/gr-blocks/lib/file_source_impl.h index 600fe80ab..fc7f8053d 100644 --- a/gr-blocks/lib/file_source_impl.h +++ b/gr-blocks/lib/file_source_impl.h @@ -24,6 +24,7 @@ #define INCLUDED_BLOCKS_FILE_SOURCE_IMPL_H #include <blocks/file_source.h> +#include <boost/thread/mutex.hpp> namespace gr { namespace blocks { |