From e7b6bcc4639464a4661d20c055cc43948eaa7e97 Mon Sep 17 00:00:00 2001 From: Josh Blum Date: Mon, 14 Jan 2013 17:41:04 -0600 Subject: block: file_source_impl missing mutex include --- gr-blocks/lib/file_source_impl.h | 1 + 1 file changed, 1 insertion(+) (limited to 'gr-blocks/lib') 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 +#include namespace gr { namespace blocks { -- cgit From f3f3b8842d011639f6b70329eaaa72dd3047da41 Mon Sep 17 00:00:00 2001 From: Johnathan Corgan Date: Wed, 23 Jan 2013 09:49:30 -0800 Subject: blocks: fix use of bare boost::mutex::scoped_lock gr_file_source gr::blocks::file_source --- gr-blocks/lib/file_source_impl.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gr-blocks/lib') diff --git a/gr-blocks/lib/file_source_impl.cc b/gr-blocks/lib/file_source_impl.cc index ed1f50c43..a8db31be7 100644 --- a/gr-blocks/lib/file_source_impl.cc +++ b/gr-blocks/lib/file_source_impl.cc @@ -84,7 +84,7 @@ namespace gr { file_source_impl::open(const char *filename, bool repeat) { // obtain exclusive access for duration of this function - boost::mutex::scoped_lock lock(fp_mutex); + gruel::scoped_lock lock(fp_mutex); int fd; @@ -113,7 +113,7 @@ namespace gr { file_source_impl::close() { // obtain exclusive access for duration of this function - boost::mutex::scoped_lock lock(fp_mutex); + gruel::scoped_lock lock(fp_mutex); if(d_new_fp != NULL) { fclose(d_new_fp); @@ -126,7 +126,7 @@ namespace gr { file_source_impl::do_update() { if(d_updated) { - boost::mutex::scoped_lock lock(fp_mutex); // hold while in scope + gruel::scoped_lock lock(fp_mutex); // hold while in scope if(d_fp) fclose(d_fp); @@ -150,7 +150,7 @@ namespace gr { if(d_fp == NULL) throw std::runtime_error("work with file not open"); - boost::mutex::scoped_lock lock(fp_mutex); // hold for the rest of this function + gruel::scoped_lock lock(fp_mutex); // hold for the rest of this function while(size) { i = fread(o, d_itemsize, size, (FILE*)d_fp); -- cgit