Merge branch 'master' into next

1 files changed, 5 insertions, 4 deletions

diff --git a/host/lib/device.cpp b/host/lib/device.cpp
index b2b0238d2..c5bc047da 100644
--- a/host/lib/device.cpp
+++ b/host/lib/device.cpp
@@ -18,6 +18,8 @@
 #include <uhd/device.hpp>
 #include <uhd/types/dict.hpp>
 #include <uhd/exception.hpp>
+#include <uhd/utils/log.hpp>
+#include <uhd/utils/msg.hpp>
 #include <uhd/utils/static.hpp>
 #include <uhd/utils/algorithm.hpp>
 #include <boost/foreach.hpp>
@@ -26,7 +28,6 @@
 #include <boost/functional/hash.hpp>
 #include <boost/tuple/tuple.hpp>
 #include <boost/thread/mutex.hpp>
-#include <iostream>
 
 using namespace uhd;
 
@@ -65,7 +66,7 @@ void device::register_device(
     const find_t &find,
     const make_t &make
 ){
-    //std::cout << "registering device" << std::endl;
+    UHD_LOGV(always) << "registering device" << std::endl;
     get_dev_fcn_regs().push_back(dev_fcn_reg_t(find, make));
 }
 
@@ -87,7 +88,7 @@ device_addrs_t device::find(const device_addr_t &hint){
             );
         }
         catch(const std::exception &e){
-            std::cerr << "Device discovery error: " << e.what() << std::endl;
+            UHD_MSG(error) << "Device discovery error: " << e.what() << std::endl;
         }
     }
 
@@ -128,7 +129,7 @@ device::sptr device::make(const device_addr_t &hint, size_t which){
     device_addr_t dev_addr; make_t maker;
     boost::tie(dev_addr, maker) = dev_addr_makers.at(which);
     size_t dev_hash = hash_device_addr(dev_addr);
-    //std::cout << boost::format("Hash: %u") % dev_hash << std::endl;
+    UHD_LOG << boost::format("Device hash: %u") % dev_hash << std::endl;
 
     //copy keys that were in hint but not in dev_addr
     //this way, we can pass additional transport arguments