diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2013-02-07 03:18:02 -0500 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2013-02-07 03:18:02 -0500 |
| commit | 2be5c8ec24fce7884ce7975592615bd1aa4ee84b (patch) | |
| tree | 01355b821521cfcbb1d3e0424a9007d723dd878d /gnuradio-core/src/lib/io | |
| parent | b6f0e19eec09066f16c6f4f91ae872985c0f34ba (diff) | |
| parent | 47c26f42b34856c5840724957868e842fdb6b857 (diff) | |
Merge branch 'master' into next
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 09f3986cd2..f3def0721b 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); |