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 /gnuradio-core/src/lib/io | |
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 'gnuradio-core/src/lib/io')
-rw-r--r-- | gnuradio-core/src/lib/io/gr_file_source.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gnuradio-core/src/lib/io/gr_file_source.cc b/gnuradio-core/src/lib/io/gr_file_source.cc index 09f3986cd..f3def0721 100644 --- a/gnuradio-core/src/lib/io/gr_file_source.cc +++ b/gnuradio-core/src/lib/io/gr_file_source.cc @@ -89,7 +89,7 @@ gr_file_source::work (int noutput_items, 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); @@ -129,7 +129,7 @@ bool gr_file_source::seek (long seek_point, int whence) { // obtain exclusive access for duration of this function - boost::mutex::scoped_lock lock(fp_mutex); + gruel::scoped_lock lock(fp_mutex); return fseek((FILE *) d_fp, seek_point * d_itemsize, whence) == 0; } @@ -137,7 +137,7 @@ void gr_file_source::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; @@ -166,7 +166,7 @@ void gr_file_source::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); @@ -179,7 +179,7 @@ void gr_file_source::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); |