summaryrefslogtreecommitdiff
path: root/gnuradio-runtime/lib/block.cc
diff options
context:
space:
mode:
authorTom Rondeau <tom@trondeau.com>2014-05-20 17:33:57 -0400
committerTom Rondeau <tom@trondeau.com>2014-05-20 17:33:57 -0400
commit9422aea27e065a7da65c42dc29d56606356f0137 (patch)
tree39185a71d19c258185f636e37d87365ed2fa5a05 /gnuradio-runtime/lib/block.cc
parentcb0bc7f070c41825ab7aee7f093dc326e62e2fdb (diff)
parent81bc67650349bf5a9f770847bde03e530655e068 (diff)
Merge branch 'fecapi'
Conflicts: cmake/Modules/FindICE-3.5.cmake gnuradio-runtime/include/gnuradio/rpcregisterhelpers.h
Diffstat (limited to 'gnuradio-runtime/lib/block.cc')
-rw-r--r--gnuradio-runtime/lib/block.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/gnuradio-runtime/lib/block.cc b/gnuradio-runtime/lib/block.cc
index 46cbc9858..e5217dbfc 100644
--- a/gnuradio-runtime/lib/block.cc
+++ b/gnuradio-runtime/lib/block.cc
@@ -111,7 +111,7 @@ namespace gr {
block::~block()
{
- global_block_registry.unregister_primitive(alias());
+ global_block_registry.unregister_primitive(symbol_name());
}
unsigned