Work on the properties framwork with wax::obj.

Now the obj handles all 3 things in 1, properties, polymorphic container, proxy.

5 files changed, 16 insertions, 16 deletions

diff --git a/include/usrp_uhd/usrp/dboard/base.hpp b/include/usrp_uhd/usrp/dboard/base.hpp
index 161d47a9e..50896b9a8 100644
--- a/include/usrp_uhd/usrp/dboard/base.hpp
+++ b/include/usrp_uhd/usrp/dboard/base.hpp
@@ -43,10 +43,10 @@ public:
     virtual ~base(void);
 
     //interface
-    virtual void rx_get(const wax::type &key, wax::type &val) = 0;
-    virtual void rx_set(const wax::type &key, const wax::type &val) = 0;
-    virtual void tx_get(const wax::type &key, wax::type &val) = 0;
-    virtual void tx_set(const wax::type &key, const wax::type &val) = 0;
+    virtual void rx_get(const wax::obj &key, wax::obj &val) = 0;
+    virtual void rx_set(const wax::obj &key, const wax::obj &val) = 0;
+    virtual void tx_get(const wax::obj &key, wax::obj &val) = 0;
+    virtual void tx_set(const wax::obj &key, const wax::obj &val) = 0;
 
 protected:
     std::string get_subdev_name(void);
@@ -84,8 +84,8 @@ public:
     virtual ~rx_base(void);
 
     //override here so the derived classes cannot
-    void tx_get(const wax::type &key, wax::type &val);
-    void tx_set(const wax::type &key, const wax::type &val);
+    void tx_get(const wax::obj &key, wax::obj &val);
+    void tx_set(const wax::obj &key, const wax::obj &val);
 };
 
 /*!
@@ -102,8 +102,8 @@ public:
     virtual ~tx_base(void);
 
     //override here so the derived classes cannot
-    void rx_get(const wax::type &key, wax::type &val);
-    void rx_set(const wax::type &key, const wax::type &val);
+    void rx_get(const wax::obj &key, wax::obj &val);
+    void rx_set(const wax::obj &key, const wax::obj &val);
 };
 
 }}} //namespace
diff --git a/include/usrp_uhd/usrp/mboard/base.hpp b/include/usrp_uhd/usrp/mboard/base.hpp
index 59236dce9..65810f329 100644
--- a/include/usrp_uhd/usrp/mboard/base.hpp
+++ b/include/usrp_uhd/usrp/mboard/base.hpp
@@ -36,8 +36,8 @@ public:
     //TODO other api calls
 
 private:
-    virtual void get(const wax::type &, wax::type &) = 0;
-    virtual void set(const wax::type &, const wax::type &) = 0;
+    virtual void get(const wax::obj &, wax::obj &) = 0;
+    virtual void set(const wax::obj &, const wax::obj &) = 0;
 };
 
 }}} //namespace
diff --git a/include/usrp_uhd/usrp/mboard/test.hpp b/include/usrp_uhd/usrp/mboard/test.hpp
index 75e1f838f..fc1ea6e70 100644
--- a/include/usrp_uhd/usrp/mboard/test.hpp
+++ b/include/usrp_uhd/usrp/mboard/test.hpp
@@ -35,8 +35,8 @@ public:
     ~test(void);
 
 private:
-    void get(const wax::type &, wax::type &);
-    void set(const wax::type &, const wax::type &);
+    void get(const wax::obj &, wax::obj &);
+    void set(const wax::obj &, const wax::obj &);
 
     std::map<std::string, dboard::manager::sptr> _dboard_managers;
 };
diff --git a/include/usrp_uhd/usrp/mboard/usrp2.hpp b/include/usrp_uhd/usrp/mboard/usrp2.hpp
index ea0083bc4..a8e950d93 100644
--- a/include/usrp_uhd/usrp/mboard/usrp2.hpp
+++ b/include/usrp_uhd/usrp/mboard/usrp2.hpp
@@ -42,8 +42,8 @@ public:
     ~usrp2(void);
 
 private:
-    void get(const wax::type &, wax::type &);
-    void set(const wax::type &, const wax::type &);
+    void get(const wax::obj &, wax::obj &);
+    void set(const wax::obj &, const wax::obj &);
 
     std::map<std::string, dboard::manager::sptr> _dboard_managers;
 };
diff --git a/include/usrp_uhd/usrp/usrp.hpp b/include/usrp_uhd/usrp/usrp.hpp
index a8cd1dc7c..a8a052b52 100644
--- a/include/usrp_uhd/usrp/usrp.hpp
+++ b/include/usrp_uhd/usrp/usrp.hpp
@@ -39,8 +39,8 @@ public:
     void recv_raw(const recv_args_t &);
 
 private:
-    void get(const wax::type &, wax::type &);
-    void set(const wax::type &, const wax::type &);
+    void get(const wax::obj &, wax::obj &);
+    void set(const wax::obj &, const wax::obj &);
 
     std::map<std::string, mboard::base::sptr> _mboards;
     boost::function<void(const device::send_args_t &)> _send_raw_cb;