gras: simplify registration object passing

4 files changed, 12 insertions, 14 deletions

diff --git a/include/gras/block.hpp b/include/gras/block.hpp
index 85a6ecc..aab0a81 100644
--- a/include/gras/block.hpp
+++ b/include/gras/block.hpp
@@ -535,8 +535,8 @@ struct GRAS_API Block : Element
      * private implementation guts for overloads and template support
      ******************************************************************/
     virtual PMCC _handle_prop_access(const std::string &, const PMCC &, const bool);
-    void _register_getter(const std::string &, PMCC);
-    void _register_setter(const std::string &, PMCC);
+    void _register_getter(const std::string &, void *);
+    void _register_setter(const std::string &, void *);
     virtual void _set_property(const std::string &, const PMCC &);
     virtual PMCC _get_property(const std::string &);
 };
diff --git a/include/gras/detail/block.hpp b/include/gras/detail/block.hpp
index 630117d..ac9a669 100644
--- a/include/gras/detail/block.hpp
+++ b/include/gras/detail/block.hpp
@@ -14,8 +14,6 @@ struct GRAS_API PropertyRegistry
     virtual PMCC get(void) = 0;
 };
 
-typedef boost::shared_ptr<PropertyRegistry> PropertyRegistrySptr;
-
 template <typename ClassType, typename ValueType>
 class PropertyRegistryImpl : public PropertyRegistry
 {
@@ -58,9 +56,8 @@ inline void Block::register_getter(
 )
 {
     ClassType *obj = dynamic_cast<ClassType *>(this);
-    PropertyRegistrySptr pr;
-    pr.reset(new PropertyRegistryImpl<ClassType, ValueType>(obj, get, NULL));
-    this->_register_getter(key, PMC_M(pr));
+    void *pr = new PropertyRegistryImpl<ClassType, ValueType>(obj, get, NULL);
+    this->_register_getter(key, pr);
 }
 
 template <typename ClassType, typename ValueType>
@@ -70,9 +67,8 @@ inline void Block::register_setter(
 )
 {
     ClassType *obj = dynamic_cast<ClassType *>(this);
-    PropertyRegistrySptr pr;
-    pr.reset(new PropertyRegistryImpl<ClassType, ValueType>(obj, NULL, set));
-    this->_register_setter(key, PMC_M(pr));
+    void *pr = new PropertyRegistryImpl<ClassType, ValueType>(obj, NULL, set);
+    this->_register_setter(key, pr);
 }
 
 template <typename ValueType>
diff --git a/lib/block_props.cpp b/lib/block_props.cpp
index d799805..f32dc69 100644
--- a/lib/block_props.cpp
+++ b/lib/block_props.cpp
@@ -97,14 +97,14 @@ static PMCC prop_access_dispatcher(ActorType &actor, const std::string &key, con
     return receiver.message.value;
 }
 
-void Block::_register_getter(const std::string &key, PMCC pr)
+void Block::_register_getter(const std::string &key, void *pr)
 {
-    (*this)->block->getter_registry[key] = pr.as<PropertyRegistrySptr>();
+    (*this)->block->getter_registry[key].reset(reinterpret_cast<PropertyRegistry *>(pr));
 }
 
-void Block::_register_setter(const std::string &key, PMCC pr)
+void Block::_register_setter(const std::string &key, void *pr)
 {
-    (*this)->block->setter_registry[key] = pr.as<PropertyRegistrySptr>();
+    (*this)->block->setter_registry[key].reset(reinterpret_cast<PropertyRegistry *>(pr));
 }
 
 void Block::_set_property(const std::string &key, const PMCC &value)
diff --git a/lib/gras_impl/block_actor.hpp b/lib/gras_impl/block_actor.hpp
index 170ee1f..bc4ecdd 100644
--- a/lib/gras_impl/block_actor.hpp
+++ b/lib/gras_impl/block_actor.hpp
@@ -23,6 +23,8 @@
 namespace gras
 {
 
+typedef boost::shared_ptr<PropertyRegistry> PropertyRegistrySptr;
+
 struct BlockActor : Apology::Worker
 {
     BlockActor(void);