From 603fb7aacdda208c4d38521f9eed81f61f6c7b9b Mon Sep 17 00:00:00 2001
From: Nicholas Corgan <nick.corgan@ettus.com>
Date: Mon, 21 Mar 2016 09:13:45 -0700
Subject: Updated code to work for new minimum dependencies

* Removed code referencing now-unsupported versions of Boost
* Added <stdint.h> includes where needed
---
 host/lib/transport/nirio/rpc/rpc_client.cpp | 24 ++----------------------
 host/lib/usrp/common/max287x.hpp            |  3 ++-
 host/lib/usrp/cores/dsp_core_utils.hpp      |  2 +-
 3 files changed, 5 insertions(+), 24 deletions(-)

(limited to 'host/lib')

diff --git a/host/lib/transport/nirio/rpc/rpc_client.cpp b/host/lib/transport/nirio/rpc/rpc_client.cpp
index bbaf9f235..3d62b57ae 100644
--- a/host/lib/transport/nirio/rpc/rpc_client.cpp
+++ b/host/lib/transport/nirio/rpc/rpc_client.cpp
@@ -1,5 +1,5 @@
 ///
-// Copyright 2013 Ettus Research LLC
+// Copyright 2013,2016 Ettus Research LLC
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -55,22 +55,7 @@ rpc_client::rpc_client (
         tcp::resolver::query::flags query_flags(tcp::resolver::query::passive);
         tcp::resolver::query query(tcp::v4(), server, port, query_flags);
         tcp::resolver::iterator iterator = resolver.resolve(query);
-
-        #if BOOST_VERSION < 104700
-            // default constructor creates end iterator
-            tcp::resolver::iterator end;
-
-            boost::system::error_code error = boost::asio::error::host_not_found;
-            while (error && iterator != end)
-            {
-                _socket.close();
-                _socket.connect(*iterator++, error);
-            }
-            if (error)
-                throw boost::system::system_error(error);
-        #else
-            boost::asio::connect(_socket, iterator);
-        #endif
+        boost::asio::connect(_socket, iterator);
 
         UHD_LOG << "rpc_client connected to server." << std::endl;
 
@@ -109,11 +94,6 @@ rpc_client::rpc_client (
     } catch (boost::exception&) {
         UHD_LOG << "rpc_client connection request cancelled/aborted." << std::endl;
         _exec_err.assign(boost::asio::error::connection_aborted, boost::asio::error::get_system_category());
-#if BOOST_VERSION < 104700
-    } catch (std::exception& e) {
-        UHD_LOG << "rpc_client connection error: " << e.what() << std::endl;
-        _exec_err.assign(boost::asio::error::connection_aborted, boost::asio::error::get_system_category());
-#endif
     }
 }
 
diff --git a/host/lib/usrp/common/max287x.hpp b/host/lib/usrp/common/max287x.hpp
index 644ec726e..596d992e0 100644
--- a/host/lib/usrp/common/max287x.hpp
+++ b/host/lib/usrp/common/max287x.hpp
@@ -1,5 +1,5 @@
 //
-// Copyright 2015 Ettus Research LLC
+// Copyright 2015-2016 Ettus Research LLC
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -27,6 +27,7 @@
 #include <boost/function.hpp>
 #include <boost/thread.hpp>
 #include <boost/math/special_functions/round.hpp>
+#include <stdint.h>
 #include <vector>
 #include "max2870_regs.hpp"
 #include "max2871_regs.hpp"
diff --git a/host/lib/usrp/cores/dsp_core_utils.hpp b/host/lib/usrp/cores/dsp_core_utils.hpp
index 5d142f5bb..d5d43f236 100644
--- a/host/lib/usrp/cores/dsp_core_utils.hpp
+++ b/host/lib/usrp/cores/dsp_core_utils.hpp
@@ -18,7 +18,7 @@
 #ifndef INCLUDED_LIBUHD_DSP_CORE_UTILS_HPP
 #define INCLUDED_LIBUHD_DSP_CORE_UTILS_HPP
 
-#include <uhd/types/stdint.hpp>
+#include <stdint.h>
 
 /*! For a requested frequency and sampling rate, return the
  *  correct frequency word (to set the CORDIC) and the actual frequency.
-- 
cgit v1.2.3