diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2013-04-02 16:02:33 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2013-04-02 16:02:33 -0700 |
| commit | eea870b1dd9c5b90dfa7d94e6a15ffe44cfbee7f (patch) | |
| tree | af3aa889c94cff9c503edefeaf19cb3635693bfb /gr-analog | |
| parent | e648165dcc7609524681b5eaf9620798b75b8420 (diff) | |
| parent | 9acf35715fbb8aca5a991a3f41965db8f4cde683 (diff) | |
Merge branch 'runtime-gruel' into next
Conflicts:
gnuradio-runtime/lib/CMakeLists.txt
Diffstat (limited to 'gr-analog')
| -rw-r--r-- | gr-analog/include/analog/api.h | 2 | ||||
| -rw-r--r-- | gr-analog/lib/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | gr-analog/lib/fastnoise_source_X_impl.cc.t | 6 | ||||
| -rw-r--r-- | gr-analog/lib/noise_source_X_impl.cc.t | 6 | ||||
| -rw-r--r-- | gr-analog/lib/qa_analog.h | 2 | ||||
| -rw-r--r-- | gr-analog/swig/CMakeLists.txt | 4 |
6 files changed, 10 insertions, 11 deletions
diff --git a/gr-analog/include/analog/api.h b/gr-analog/include/analog/api.h index b7dee46933..2459ace614 100644 --- a/gr-analog/include/analog/api.h +++ b/gr-analog/include/analog/api.h @@ -22,7 +22,7 @@ #ifndef INCLUDED_ANALOG_API_H #define INCLUDED_ANALOG_API_H -#include <gruel/attributes.h> +#include <attributes.h> #ifdef gnuradio_analog_EXPORTS # define ANALOG_API __GR_ATTR_EXPORT diff --git a/gr-analog/lib/CMakeLists.txt b/gr-analog/lib/CMakeLists.txt index 5cb00e9f94..5719eac7a5 100644 --- a/gr-analog/lib/CMakeLists.txt +++ b/gr-analog/lib/CMakeLists.txt @@ -30,7 +30,6 @@ include_directories( ${GR_BLOCKS_INCLUDE_DIRS} ${GNURADIO_RUNTIME_INCLUDE_DIRS} ${VOLK_INCLUDE_DIRS} - ${GRUEL_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ) diff --git a/gr-analog/lib/fastnoise_source_X_impl.cc.t b/gr-analog/lib/fastnoise_source_X_impl.cc.t index 25ad8073aa..706ddbbf84 100644 --- a/gr-analog/lib/fastnoise_source_X_impl.cc.t +++ b/gr-analog/lib/fastnoise_source_X_impl.cc.t @@ -59,7 +59,7 @@ namespace gr { void @IMPL_NAME@::set_type(noise_type_t type) { - gruel::scoped_lock l(d_setlock); + gr::thread::scoped_lock l(d_setlock); d_type = type; generate(); } @@ -67,7 +67,7 @@ namespace gr { void @IMPL_NAME@::set_amplitude(float ampl) { - gruel::scoped_lock l(d_setlock); + gr::thread::scoped_lock l(d_setlock); d_ampl = ampl; generate(); } @@ -123,7 +123,7 @@ namespace gr { gr_vector_const_void_star &input_items, gr_vector_void_star &output_items) { - gruel::scoped_lock l(d_setlock); + gr::thread::scoped_lock l(d_setlock); @TYPE@ *out = (@TYPE@*)output_items[0]; diff --git a/gr-analog/lib/noise_source_X_impl.cc.t b/gr-analog/lib/noise_source_X_impl.cc.t index 40e2517d2e..7f371b2cfd 100644 --- a/gr-analog/lib/noise_source_X_impl.cc.t +++ b/gr-analog/lib/noise_source_X_impl.cc.t @@ -57,14 +57,14 @@ namespace gr { void @IMPL_NAME@::set_type(noise_type_t type) { - gruel::scoped_lock l(d_setlock); + gr::thread::scoped_lock l(d_setlock); d_type = type; } void @IMPL_NAME@::set_amplitude(float ampl) { - gruel::scoped_lock l(d_setlock); + gr::thread::scoped_lock l(d_setlock); d_ampl = ampl; } @@ -73,7 +73,7 @@ namespace gr { gr_vector_const_void_star &input_items, gr_vector_void_star &output_items) { - gruel::scoped_lock l(d_setlock); + gr::thread::scoped_lock l(d_setlock); @TYPE@ *out = (@TYPE@*)output_items[0]; diff --git a/gr-analog/lib/qa_analog.h b/gr-analog/lib/qa_analog.h index 458861cc91..b66b62b5fe 100644 --- a/gr-analog/lib/qa_analog.h +++ b/gr-analog/lib/qa_analog.h @@ -23,7 +23,7 @@ #ifndef _QA_GR_ANALOG_H_ #define _QA_GR_ANALOG_H_ -#include <gruel/attributes.h> +#include <attributes.h> #include <cppunit/TestSuite.h> //! collect all the tests for the gr-analog directory diff --git a/gr-analog/swig/CMakeLists.txt b/gr-analog/swig/CMakeLists.txt index 8b56be500c..5c940e66af 100644 --- a/gr-analog/swig/CMakeLists.txt +++ b/gr-analog/swig/CMakeLists.txt @@ -28,12 +28,12 @@ set(GR_SWIG_INCLUDE_DIRS ${GR_ANALOG_INCLUDE_DIRS} ${GR_FILTER_INCLUDE_DIRS} ${GNURADIO_RUNTIME_SWIG_INCLUDE_DIRS} - ${GRUEL_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ) set(GR_SWIG_DOC_FILE ${CMAKE_CURRENT_BINARY_DIR}/analog_swig_doc.i) -set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../lib) +set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../include/analog) +set(GR_SWIG_DOCS_TARGET_DEPS runtime_swig_swig_doc) set(GR_SWIG_TARGET_DEPS analog_generated_includes) set(GR_SWIG_LIBRARIES gnuradio-analog gnuradio-filter) |