Merged mblock work-in-progress eb/mb -r4798:4808 into trunk.

git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@4809 221aa14e-8319-0410-a670-987f0aec2ac5

1 files changed, 10 insertions, 5 deletions

diff --git a/mblock/src/lib/mb_mblock.h b/mblock/src/lib/mb_mblock.h
index 00e4051c0..594920f91 100644
--- a/mblock/src/lib/mb_mblock.h
+++ b/mblock/src/lib/mb_mblock.h
@@ -24,7 +24,6 @@
 #include <mb_common.h>
 #include <mb_message.h>
 #include <mb_port.h>
-#include <boost/enable_shared_from_this.hpp>
 
 
 /*!
@@ -175,15 +174,21 @@ protected:
   int
   nconnections() const;
 
+  //! Set the class name
+  void set_class_name(const std::string name);
 
 public:
   virtual ~mb_mblock();
 
-  void set_fullname(const std::string name);
-  
-  //! Return full name of this block
-  std::string fullname() const;
+  //! Return instance name of this block
+  std::string instance_name() const;
+
+  //! Return the class name of this block
+  std::string class_name() const;
 
+  //! Set the instance name of this block.
+  void set_instance_name(const std::string name);
+  
   //! Return the parent of this mblock, or 0 if we're the top-level block.
   mb_mblock *parent() const;