aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--host/include/uhd/types/CMakeLists.txt3
-rw-r--r--host/include/uhd/types/stdint.hpp53
-rw-r--r--host/include/uhd/utils/atomic.hpp8
-rw-r--r--host/lib/transport/nirio/rpc/rpc_client.cpp24
-rw-r--r--host/lib/usrp/common/max287x.hpp3
-rw-r--r--host/lib/usrp/cores/dsp_core_utils.hpp2
-rw-r--r--host/utils/converter_benchmark.cpp3
7 files changed, 10 insertions, 86 deletions
diff --git a/host/include/uhd/types/CMakeLists.txt b/host/include/uhd/types/CMakeLists.txt
index 3af395eeb..682d3cd9b 100644
--- a/host/include/uhd/types/CMakeLists.txt
+++ b/host/include/uhd/types/CMakeLists.txt
@@ -1,5 +1,5 @@
#
-# Copyright 2010-2011,2015 Ettus Research LLC
+# Copyright 2010-2011,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
@@ -33,7 +33,6 @@ UHD_INSTALL(FILES
sensors.hpp
serial.hpp
sid.hpp
- stdint.hpp
stream_cmd.hpp
time_spec.hpp
tune_request.hpp
diff --git a/host/include/uhd/types/stdint.hpp b/host/include/uhd/types/stdint.hpp
deleted file mode 100644
index 164ebc807..000000000
--- a/host/include/uhd/types/stdint.hpp
+++ /dev/null
@@ -1,53 +0,0 @@
-//
-// Copyright 2015 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
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program. If not, see <http://www.gnu.org/licenses/>.
-//
-
-#ifndef INCLUDED_UHD_TYPES_STDINT_HPP
-#define INCLUDED_UHD_TYPES_STDINT_HPP
-
-#include <boost/cstdint.hpp>
-
-using boost::int8_t;
-using boost::uint8_t;
-using boost::int16_t;
-using boost::uint16_t;
-using boost::int32_t;
-using boost::uint32_t;
-using boost::int64_t;
-using boost::uint64_t;
-
-using boost::int_least8_t;
-using boost::uint_least8_t;
-using boost::int_least16_t;
-using boost::uint_least16_t;
-using boost::int_least32_t;
-using boost::uint_least32_t;
-using boost::int_least64_t;
-using boost::uint_least64_t;
-
-using boost::int_fast8_t;
-using boost::uint_fast8_t;
-using boost::int_fast16_t;
-using boost::uint_fast16_t;
-using boost::int_fast32_t;
-using boost::uint_fast32_t;
-using boost::int_fast64_t;
-using boost::uint_fast64_t;
-
-using ::intptr_t;
-using ::uintptr_t;
-
-#endif /* INCLUDED_UHD_TYPES_STDINT_HPP */
diff --git a/host/include/uhd/utils/atomic.hpp b/host/include/uhd/utils/atomic.hpp
index 55769d2fd..8c5e6a5da 100644
--- a/host/include/uhd/utils/atomic.hpp
+++ b/host/include/uhd/utils/atomic.hpp
@@ -1,5 +1,5 @@
//
-// Copyright 2012-2013 Ettus Research LLC
+// Copyright 2012-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
@@ -26,11 +26,7 @@
#include <boost/interprocess/detail/atomic.hpp>
#include <boost/version.hpp>
-#if BOOST_VERSION >= 104800
-# define BOOST_IPC_DETAIL boost::interprocess::ipcdetail
-#else
-# define BOOST_IPC_DETAIL boost::interprocess::detail
-#endif
+#define BOOST_IPC_DETAIL boost::interprocess::ipcdetail
namespace uhd{
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.
diff --git a/host/utils/converter_benchmark.cpp b/host/utils/converter_benchmark.cpp
index 0f38e8518..ddbf50255 100644
--- a/host/utils/converter_benchmark.cpp
+++ b/host/utils/converter_benchmark.cpp
@@ -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 <iomanip>
#include <map>
#include <complex>
+#include <stdint.h>
namespace po = boost::program_options;
using namespace uhd::convert;
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-15 18:57:42 +0000