Updated code to work for new minimum dependencies

* Removed code referencing now-unsupported versions of Boost
* Added <stdint.h> includes where needed

3 files changed, 3 insertions, 61 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{