Made get_link the only way to create nested props.

Removed the obj::ptr and sptr typedefs.
The dboard manager now must store not the subdevs, but their proxies.

1 files changed, 6 insertions, 5 deletions

diff --git a/include/usrp_uhd/usrp/dboard/manager.hpp b/include/usrp_uhd/usrp/dboard/manager.hpp
index e4eb76bcf..8cc5658d9 100644
--- a/include/usrp_uhd/usrp/dboard/manager.hpp
+++ b/include/usrp_uhd/usrp/dboard/manager.hpp
@@ -66,14 +66,15 @@ public:
     //interface
     prop_names_t get_rx_subdev_names(void);
     prop_names_t get_tx_subdev_names(void);
-    wax::obj::sptr get_rx_subdev(const std::string &subdev_name);
-    wax::obj::sptr get_tx_subdev(const std::string &subdev_name);
+    wax::obj get_rx_subdev(const std::string &subdev_name);
+    wax::obj get_tx_subdev(const std::string &subdev_name);
 
 private:
     //list of rx and tx dboards in this manager
-    //each dboard here is actually a subdevice
-    std::map<std::string, base::sptr> _rx_dboards;
-    std::map<std::string, base::sptr> _tx_dboards;
+    //each dboard here is actually a subdevice proxy
+    //the subdevice proxy is internal to the cpp file
+    std::map<std::string, wax::obj> _rx_dboards;
+    std::map<std::string, wax::obj> _tx_dboards;
 };
 
 }}} //namespace