diff options
author | Josh Blum | 2013-07-31 00:20:23 -0700 |
---|---|---|
committer | Josh Blum | 2013-07-31 00:20:23 -0700 |
commit | 6961a794356d413f81bfbf347ed84619b1125d22 (patch) | |
tree | d3bbafeddf6060e473bf57536515f89c7d4f0b5c /gnuradio-core/src | |
parent | 0583bf111454166458ebadfcaa03eb3c0c5fa853 (diff) | |
download | gnuradio-6961a794356d413f81bfbf347ed84619b1125d22.tar.gz gnuradio-6961a794356d413f81bfbf347ed84619b1125d22.tar.bz2 gnuradio-6961a794356d413f81bfbf347ed84619b1125d22.zip |
gras: transplant get_initial_sptr for teh compilz
Diffstat (limited to 'gnuradio-core/src')
-rw-r--r-- | gnuradio-core/src/lib/runtime/gr_block.h | 11 | ||||
-rw-r--r-- | gnuradio-core/src/lib/runtime/gr_sptr_magic.h | 2 |
2 files changed, 2 insertions, 11 deletions
diff --git a/gnuradio-core/src/lib/runtime/gr_block.h b/gnuradio-core/src/lib/runtime/gr_block.h index 08914f24a..bd085100b 100644 --- a/gnuradio-core/src/lib/runtime/gr_block.h +++ b/gnuradio-core/src/lib/runtime/gr_block.h @@ -32,16 +32,7 @@ #include <map> #include <boost/foreach.hpp> #include <gruel/thread.h> - -namespace gnuradio -{ -//! dummy entry, just here for legacy purposes -template <typename T> -boost::shared_ptr<T> get_initial_sptr(T *p) -{ - return boost::shared_ptr<T>(p); -} -} +#include <gr_sptr_magic.h> struct GR_CORE_API gr_block : gras::Block { diff --git a/gnuradio-core/src/lib/runtime/gr_sptr_magic.h b/gnuradio-core/src/lib/runtime/gr_sptr_magic.h index 3d997539c..d9c7f26c4 100644 --- a/gnuradio-core/src/lib/runtime/gr_sptr_magic.h +++ b/gnuradio-core/src/lib/runtime/gr_sptr_magic.h @@ -45,7 +45,7 @@ namespace gnuradio { boost::shared_ptr<T> get_initial_sptr(T *p) { - return boost::dynamic_pointer_cast<T, gr_basic_block>(detail::sptr_magic::fetch_initial_sptr(p)); + return boost::shared_ptr<T>(p);//return boost::dynamic_pointer_cast<T, gr_basic_block>(detail::sptr_magic::fetch_initial_sptr(p)); } }; |