From cc8caeb1230fbaed4a6bc64848a584d51b69362a Mon Sep 17 00:00:00 2001 From: Josh Blum Date: Mon, 1 Feb 2010 12:35:34 -0800 Subject: Work on the properties framwork with wax::obj. Now the obj handles all 3 things in 1, properties, polymorphic container, proxy. --- lib/usrp/usrp.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'lib/usrp/usrp.cpp') diff --git a/lib/usrp/usrp.cpp b/lib/usrp/usrp.cpp index 56bfd37fc..e3016be5f 100644 --- a/lib/usrp/usrp.cpp +++ b/lib/usrp/usrp.cpp @@ -54,9 +54,9 @@ usrp::~usrp(void){ /* NOP */ } -void usrp::get(const wax::type &key_, wax::type &val){ - wax::type key; std::string name; - tie(key, name) = extract_named_prop(key_); +void usrp::get(const wax::obj &key_, wax::obj &val){ + wax::obj key; std::string name; + boost::tie(key, name) = extract_named_prop(key_); //handle the get request conditioned on the key switch(wax::cast(key)){ @@ -70,7 +70,7 @@ void usrp::get(const wax::type &key_, wax::type &val){ ); //turn the mboard sptr object into a wax::obj::sptr //this allows the properties access through the wax::proxy - val = wax::obj::cast(_mboards[name]); + val = _mboards[name]->get_link(); return; case DEVICE_PROP_MBOARD_NAMES: @@ -79,7 +79,7 @@ void usrp::get(const wax::type &key_, wax::type &val){ } } -void usrp::set(const wax::type &, const wax::type &){ +void usrp::set(const wax::obj &, const wax::obj &){ throw std::runtime_error("Cannot set in usrp device"); } -- cgit v1.2.3