summaryrefslogtreecommitdiff
path: root/gr-blocks/lib/file_source_impl.cc
diff options
context:
space:
mode:
authorJohnathan Corgan2013-02-07 02:51:18 -0500
committerJohnathan Corgan2013-02-07 02:51:18 -0500
commit47c26f42b34856c5840724957868e842fdb6b857 (patch)
tree32a35a9751a5daf2c465f49104f5337ce3eeffa3 /gr-blocks/lib/file_source_impl.cc
parentbb156c4879fadecbe9ab45085736c1b52552efe6 (diff)
parent4a9b54a2b860c445401523a4c2fc3be5da8b3afc (diff)
downloadgnuradio-47c26f42b34856c5840724957868e842fdb6b857.tar.gz
gnuradio-47c26f42b34856c5840724957868e842fdb6b857.tar.bz2
gnuradio-47c26f42b34856c5840724957868e842fdb6b857.zip
Merge branch 'maint'
Diffstat (limited to 'gr-blocks/lib/file_source_impl.cc')
-rw-r--r--gr-blocks/lib/file_source_impl.cc8
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);