summaryrefslogtreecommitdiff
path: root/lib/register_messages.cpp
diff options
context:
space:
mode:
authorJosh Blum2012-10-11 22:16:06 -0700
committerJosh Blum2012-10-11 22:16:06 -0700
commit83d855d2e88e631cbb607841f985e294b2f0845d (patch)
treedd33f16834cb28a4a4be81c14e82acf05879a066 /lib/register_messages.cpp
parent9681d80c37794d66fd8a171efb4b047306b937d3 (diff)
downloadsandhi-83d855d2e88e631cbb607841f985e294b2f0845d.tar.gz
sandhi-83d855d2e88e631cbb607841f985e294b2f0845d.tar.bz2
sandhi-83d855d2e88e631cbb607841f985e294b2f0845d.zip
make use of new message registration macros
Diffstat (limited to 'lib/register_messages.cpp')
-rw-r--r--lib/register_messages.cpp39
1 files changed, 18 insertions, 21 deletions
diff --git a/lib/register_messages.cpp b/lib/register_messages.cpp
index 7c894fa..4d774ea 100644
--- a/lib/register_messages.cpp
+++ b/lib/register_messages.cpp
@@ -14,31 +14,28 @@
// You should have received a copy of the GNU Lesser General Public License
// along with io_sig program. If not, see <http://www.gnu.org/licenses/>.
-#include <Theron/Register.h>
#include <gnuradio/top_block.hpp>
#include <gras_impl/messages.hpp>
#include <gras_impl/interruptible_thread.hpp>
-#include <Apology/Worker.hpp>
-THERON_REGISTER_MESSAGE(Apology::WorkerTopologyMessage);
-THERON_REGISTER_MESSAGE(gnuradio::TopAllocMessage);
-THERON_REGISTER_MESSAGE(gnuradio::TopActiveMessage);
-THERON_REGISTER_MESSAGE(gnuradio::TopInertMessage);
-THERON_REGISTER_MESSAGE(gnuradio::TopTokenMessage);
-THERON_REGISTER_MESSAGE(gnuradio::GlobalBlockConfig);
-THERON_REGISTER_MESSAGE(gnuradio::SharedThreadGroup);
+THERON_DEFINE_REGISTERED_MESSAGE(gnuradio::TopAllocMessage);
+THERON_DEFINE_REGISTERED_MESSAGE(gnuradio::TopActiveMessage);
+THERON_DEFINE_REGISTERED_MESSAGE(gnuradio::TopInertMessage);
+THERON_DEFINE_REGISTERED_MESSAGE(gnuradio::TopTokenMessage);
+THERON_DEFINE_REGISTERED_MESSAGE(gnuradio::GlobalBlockConfig);
+THERON_DEFINE_REGISTERED_MESSAGE(gnuradio::SharedThreadGroup);
-THERON_REGISTER_MESSAGE(gnuradio::InputTagMessage);
-THERON_REGISTER_MESSAGE(gnuradio::InputBufferMessage);
-THERON_REGISTER_MESSAGE(gnuradio::InputTokenMessage);
-THERON_REGISTER_MESSAGE(gnuradio::InputCheckMessage);
-THERON_REGISTER_MESSAGE(gnuradio::InputAllocMessage);
+THERON_DEFINE_REGISTERED_MESSAGE(gnuradio::InputTagMessage);
+THERON_DEFINE_REGISTERED_MESSAGE(gnuradio::InputBufferMessage);
+THERON_DEFINE_REGISTERED_MESSAGE(gnuradio::InputTokenMessage);
+THERON_DEFINE_REGISTERED_MESSAGE(gnuradio::InputCheckMessage);
+THERON_DEFINE_REGISTERED_MESSAGE(gnuradio::InputAllocMessage);
-THERON_REGISTER_MESSAGE(gnuradio::OutputBufferMessage);
-THERON_REGISTER_MESSAGE(gnuradio::OutputTokenMessage);
-THERON_REGISTER_MESSAGE(gnuradio::OutputCheckMessage);
-THERON_REGISTER_MESSAGE(gnuradio::OutputHintMessage);
-THERON_REGISTER_MESSAGE(gnuradio::OutputAllocMessage);
+THERON_DEFINE_REGISTERED_MESSAGE(gnuradio::OutputBufferMessage);
+THERON_DEFINE_REGISTERED_MESSAGE(gnuradio::OutputTokenMessage);
+THERON_DEFINE_REGISTERED_MESSAGE(gnuradio::OutputCheckMessage);
+THERON_DEFINE_REGISTERED_MESSAGE(gnuradio::OutputHintMessage);
+THERON_DEFINE_REGISTERED_MESSAGE(gnuradio::OutputAllocMessage);
-THERON_REGISTER_MESSAGE(gnuradio::SelfKickMessage);
-THERON_REGISTER_MESSAGE(gnuradio::UpdateInputsMessage);
+THERON_DEFINE_REGISTERED_MESSAGE(gnuradio::SelfKickMessage);
+THERON_DEFINE_REGISTERED_MESSAGE(gnuradio::UpdateInputsMessage);