From 26cc20847cde543e759aa5cee9a27eaa69c5dd9e Mon Sep 17 00:00:00 2001
From: Andrej Rode <andrej.rode@ettus.com>
Date: Thu, 9 Feb 2017 23:19:55 -0800
Subject: uhd: replace BOOST_FOREACH with C++11 range-based for loop

Note: This is the first commit that uses for-range, and range-based
for-loops are now usable for UHD development.
---
 host/lib/device.cpp | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'host/lib/device.cpp')

diff --git a/host/lib/device.cpp b/host/lib/device.cpp
index c75ecad77..40798c6c3 100644
--- a/host/lib/device.cpp
+++ b/host/lib/device.cpp
@@ -22,7 +22,6 @@
 #include <uhd/utils/msg.hpp>
 #include <uhd/utils/static.hpp>
 #include <uhd/utils/algorithm.hpp>
-#include <boost/foreach.hpp>
 #include <boost/format.hpp>
 #include <boost/weak_ptr.hpp>
 #include <boost/functional/hash.hpp>
@@ -53,7 +52,7 @@ static size_t hash_device_addr(
         boost::hash_combine(hash, dev_addr["resource"]);
     }
     else {
-        BOOST_FOREACH(const std::string &key, uhd::sorted(dev_addr.keys())){
+        for(const std::string &key:  uhd::sorted(dev_addr.keys())){
             boost::hash_combine(hash, key);
             boost::hash_combine(hash, dev_addr[key]);
         }
@@ -90,7 +89,7 @@ device_addrs_t device::find(const device_addr_t &hint, device_filter_t filter){
 
     device_addrs_t device_addrs;
 
-    BOOST_FOREACH(const dev_fcn_reg_t &fcn, get_dev_fcn_regs()) {
+    for(const dev_fcn_reg_t &fcn:  get_dev_fcn_regs()) {
         try {
             if (filter == ANY or fcn.get<2>() == filter) {
                 device_addrs_t discovered_addrs = fcn.get<0>()(hint);
@@ -118,10 +117,10 @@ device::sptr device::make(const device_addr_t &hint, device_filter_t filter, siz
     typedef boost::tuple<device_addr_t, make_t> dev_addr_make_t;
     std::vector<dev_addr_make_t> dev_addr_makers;
 
-    BOOST_FOREACH(const dev_fcn_reg_t &fcn, get_dev_fcn_regs()){
+    for(const dev_fcn_reg_t &fcn:  get_dev_fcn_regs()){
         try{
             if(filter == ANY or fcn.get<2>() == filter){
-                BOOST_FOREACH(device_addr_t dev_addr, fcn.get<0>()(hint)){
+                for(device_addr_t dev_addr:  fcn.get<0>()(hint)){
                     //append the discovered address and its factory function
                     dev_addr_makers.push_back(dev_addr_make_t(dev_addr, fcn.get<1>()));
                 }
@@ -154,7 +153,7 @@ device::sptr device::make(const device_addr_t &hint, device_filter_t filter, siz
 
     //copy keys that were in hint but not in dev_addr
     //this way, we can pass additional transport arguments
-    BOOST_FOREACH(const std::string &key, hint.keys()){
+    for(const std::string &key:  hint.keys()){
         if (not dev_addr.has_key(key)) dev_addr[key] = hint[key];
     }
 
-- 
cgit v1.2.3