diff options
author | Tom Rondeau | 2013-02-07 11:08:53 -0500 |
---|---|---|
committer | Tom Rondeau | 2013-02-07 11:08:53 -0500 |
commit | 23e56ce76921dc6aafd868dac421023646641925 (patch) | |
tree | b5c259b4de7ed0f864c29cbee2aad557b5aaa0e9 /gr-blocks | |
parent | e532342c4b67b10f180f4da5b5ab6c89ea3179f0 (diff) | |
parent | ce7d46835eef941dad82edbfe9b353925d3d3954 (diff) | |
download | gnuradio-23e56ce76921dc6aafd868dac421023646641925.tar.gz gnuradio-23e56ce76921dc6aafd868dac421023646641925.tar.bz2 gnuradio-23e56ce76921dc6aafd868dac421023646641925.zip |
Merge branch 'master' of gnuradio.org:gnuradio
Diffstat (limited to 'gr-blocks')
-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); |