diff options
author | Johnathan Corgan | 2013-02-07 02:51:18 -0500 |
---|---|---|
committer | Johnathan Corgan | 2013-02-07 02:51:18 -0500 |
commit | 47c26f42b34856c5840724957868e842fdb6b857 (patch) | |
tree | 32a35a9751a5daf2c465f49104f5337ce3eeffa3 /gnuradio-core | |
parent | bb156c4879fadecbe9ab45085736c1b52552efe6 (diff) | |
parent | 4a9b54a2b860c445401523a4c2fc3be5da8b3afc (diff) | |
download | gnuradio-47c26f42b34856c5840724957868e842fdb6b857.tar.gz gnuradio-47c26f42b34856c5840724957868e842fdb6b857.tar.bz2 gnuradio-47c26f42b34856c5840724957868e842fdb6b857.zip |
Merge branch 'maint'
Diffstat (limited to 'gnuradio-core')
-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); |