diff options
author | Josh Blum | 2013-02-17 16:46:08 -0800 |
---|---|---|
committer | Josh Blum | 2013-02-17 16:46:08 -0800 |
commit | 7839db580435ad0d39f307bde185dfdcda01ec12 (patch) | |
tree | 7c15be4cb502d65f808d390abd24e7b388b7c4e0 /gr-blocks/lib/file_source_impl.cc | |
parent | bc8bbc71f799ea81e38104ff9d943a5eab1e203c (diff) | |
parent | 0dcdc099ecbb01e72b0c5935437f154e47763055 (diff) | |
download | gnuradio-7839db580435ad0d39f307bde185dfdcda01ec12.tar.gz gnuradio-7839db580435ad0d39f307bde185dfdcda01ec12.tar.bz2 gnuradio-7839db580435ad0d39f307bde185dfdcda01ec12.zip |
Merge branch 'maint' into v3.6.4git_gras_support
Diffstat (limited to 'gr-blocks/lib/file_source_impl.cc')
-rw-r--r-- | gr-blocks/lib/file_source_impl.cc | 8 |
1 files changed, 4 insertions, 4 deletions
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); |