diff options
| author | jcorgan | 2009-07-20 03:47:14 +0000 |
|---|---|---|
| committer | jcorgan | 2009-07-20 03:47:14 +0000 |
| commit | 6f50256f958ac60d5fc9212b24d86777c1b2ec0d (patch) | |
| tree | afdde009cf81d93bcb84027937c62ef71194d9fd /mblock/src/lib/mb_worker.cc | |
| parent | aff2d8ad842994b1f58e0dc56b7d2fd6229377a9 (diff) | |
| download | gnuradio-6f50256f958ac60d5fc9212b24d86777c1b2ec0d.tar.gz gnuradio-6f50256f958ac60d5fc9212b24d86777c1b2ec0d.tar.bz2 gnuradio-6f50256f958ac60d5fc9212b24d86777c1b2ec0d.zip | |
Merged r11452:11459 from jcorgan/pmt-gruel into trunk. Trunk passes distcheck.
* Merges libpmt into libgruel
* Modifies libmblock to use libgruel
gruel::pmt_t will be the fundamental msg content for the new message passing
implemention for 3.3.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@11460 221aa14e-8319-0410-a670-987f0aec2ac5
Diffstat (limited to 'mblock/src/lib/mb_worker.cc')
| -rw-r--r-- | mblock/src/lib/mb_worker.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mblock/src/lib/mb_worker.cc b/mblock/src/lib/mb_worker.cc index 3b984875f..a553198ea 100644 --- a/mblock/src/lib/mb_worker.cc +++ b/mblock/src/lib/mb_worker.cc @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2007,2008 Free Software Foundation, Inc. + * Copyright 2007,2008,2009 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -37,13 +37,13 @@ #define VERBOSE 0 // define to 0 or 1 -static pmt_t s_worker_state_changed = pmt_intern("%worker-state-changed"); +static gruel::pmt_t s_worker_state_changed = gruel::pmt_intern("%worker-state-changed"); mb_worker::mb_worker(mb_runtime_thread_per_block *runtime, mb_mblock_maker_t maker, const std::string &instance_name, - pmt_t user_arg) + gruel::pmt_t user_arg) : omni_thread((void *) 0, PRIORITY_NORMAL), d_runtime(runtime), d_maker(maker), d_instance_name(instance_name), d_user_arg(user_arg), @@ -95,7 +95,7 @@ mb_worker::set_state(worker_state_t state) } // send msg to runtime, telling it something changed. - (*d_runtime->accepter())(s_worker_state_changed, PMT_F, PMT_F, MB_PRI_BEST); + (*d_runtime->accepter())(s_worker_state_changed, gruel::PMT_F, gruel::PMT_F, MB_PRI_BEST); } void * |