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-blocks/lib/vector_map_impl.h | |
| parent | e648165dcc7609524681b5eaf9620798b75b8420 (diff) | |
| parent | 9acf35715fbb8aca5a991a3f41965db8f4cde683 (diff) | |
Merge branch 'runtime-gruel' into next
Conflicts:
gnuradio-runtime/lib/CMakeLists.txt
Diffstat (limited to 'gr-blocks/lib/vector_map_impl.h')
| -rw-r--r-- | gr-blocks/lib/vector_map_impl.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gr-blocks/lib/vector_map_impl.h b/gr-blocks/lib/vector_map_impl.h index e27b3b9cec..08faa2ce09 100644 --- a/gr-blocks/lib/vector_map_impl.h +++ b/gr-blocks/lib/vector_map_impl.h @@ -24,7 +24,7 @@ #define INCLUDED_GR_VECTOR_MAP_IMPL_H #include <blocks/vector_map.h> -#include <gruel/thread.h> +#include <thread/thread.h> namespace gr { namespace blocks { @@ -35,7 +35,7 @@ namespace gr { size_t d_item_size; std::vector<size_t> d_in_vlens; std::vector< std::vector< std::vector<size_t> > > d_mapping; - gruel::mutex d_mutex; // mutex to protect set/work access + gr::thread::mutex d_mutex; // mutex to protect set/work access public: vector_map_impl(size_t item_size, std::vector<size_t> in_vlens, |