41c41
<     boost::weak_ptr<usrp2::usrp2>  value;
---
>     boost::weak_ptr<usrp2>  value;
43c43
<     usrp_table_entry(const std::string &_key, boost::weak_ptr<usrp2::usrp2> _value)
---
>     usrp_table_entry(const std::string &_key, boost::weak_ptr<usrp2> _value)
73c73
<     usrp2::sptr r(new usrp2::usrp2(ifc, pr, rx_bufsize));
---
>     usrp2::sptr r(new usrp2(ifc, pr, rx_bufsize));