summaryrefslogtreecommitdiffstats
path: root/include/usrp_uhd/wax.hpp
diff options
context:
space:
mode:
authorJosh Blum <josh@joshknows.com>2010-02-05 11:36:17 -0800
committerJosh Blum <josh@joshknows.com>2010-02-05 11:36:17 -0800
commit89152d1ffe452438db46932ebc62d5ccc5b79208 (patch)
tree47c261e35669fbc8a5e0dd0a1a9db63bcd1a5964 /include/usrp_uhd/wax.hpp
parentbff701727b268a87900b5f8445847a3920c23541 (diff)
downloaduhd-89152d1ffe452438db46932ebc62d5ccc5b79208.tar.gz
uhd-89152d1ffe452438db46932ebc62d5ccc5b79208.tar.bz2
uhd-89152d1ffe452438db46932ebc62d5ccc5b79208.zip
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.
Diffstat (limited to 'include/usrp_uhd/wax.hpp')
-rw-r--r--include/usrp_uhd/wax.hpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/include/usrp_uhd/wax.hpp b/include/usrp_uhd/wax.hpp
index f0e7a3acc..29a96cdb6 100644
--- a/include/usrp_uhd/wax.hpp
+++ b/include/usrp_uhd/wax.hpp
@@ -19,7 +19,6 @@
#define INCLUDED_WAX_HPP
#include <boost/any.hpp>
-#include <boost/shared_ptr.hpp>
#include <iostream>
/*!
@@ -45,8 +44,6 @@
namespace wax{
- typedef boost::bad_any_cast bad_cast;
-
/*!
* WAX object base class:
*
@@ -61,9 +58,6 @@ namespace wax{
*/
class obj{
public:
- //obj pointer typedefs
- typedef boost::shared_ptr<obj> sptr;
- typedef obj* ptr;
/*!
* Default constructor:
@@ -151,6 +145,12 @@ namespace wax{
};
/*!
+ * The wax::bad cast will be thrown when
+ * cast is called with the wrong typeid.
+ */
+ typedef boost::bad_any_cast bad_cast;
+
+ /*!
* Cast a wax::obj into the desired obj.
* Usage wax::cast<new_obj>(my_value).
*