2 files changed, 8 insertions, 8 deletions
diff --git a/host/lib/usrp/cores/i2c_core_200.cpp b/host/lib/usrp/cores/i2c_core_200.cpp
index 93e3fedf8..fd9332638 100644
--- a/host/lib/usrp/cores/i2c_core_200.cpp
+++ b/host/lib/usrp/cores/i2c_core_200.cpp
@@ -8,8 +8,8 @@
 #include <uhd/exception.hpp>
 #include <uhd/utils/log.hpp>
 #include <uhdlib/usrp/cores/i2c_core_200.hpp>
-#include <boost/thread/mutex.hpp>
 #include <chrono>
+#include <mutex>
 #include <thread>
 
 #define REG_I2C_WR_PRESCALER_LO (1 << 3) | 0
@@ -137,13 +137,13 @@ private:
 
     void poke(const size_t what, const uint8_t cmd)
     {
-        boost::mutex::scoped_lock lock(_mutex);
+        std::lock_guard<std::mutex> lock(_mutex);
         _iface->poke32(_base, (what << 8) | cmd);
     }
 
     uint8_t peek(const size_t what)
     {
-        boost::mutex::scoped_lock lock(_mutex);
+        std::lock_guard<std::mutex> lock(_mutex);
         _iface->poke32(_base, what << 8);
         return uint8_t(_iface->peek32(_readback));
     }
@@ -151,7 +151,7 @@ private:
     wb_iface::sptr _iface;
     const size_t _base;
     const size_t _readback;
-    boost::mutex _mutex;
+    std::mutex _mutex;
 };
 
 i2c_core_200::sptr i2c_core_200::make(
diff --git a/host/lib/usrp/cores/user_settings_core_3000.cpp b/host/lib/usrp/cores/user_settings_core_3000.cpp
index 9e04175c2..7293f9070 100644
--- a/host/lib/usrp/cores/user_settings_core_3000.cpp
+++ b/host/lib/usrp/cores/user_settings_core_3000.cpp
@@ -7,7 +7,7 @@
 
 #include <uhd/exception.hpp>
 #include <uhdlib/usrp/cores/user_settings_core_3000.hpp>
-#include <boost/thread/thread.hpp>
+#include <mutex>
 
 using namespace uhd;
 
@@ -38,7 +38,7 @@ public:
         if (offset % sizeof(uint64_t) != 0)
             throw uhd::value_error("peek64: Incorrect address alignment");
 
-        boost::unique_lock<boost::mutex> lock(_mutex);
+        std::unique_lock<std::mutex> lock(_mutex);
         _iface->poke32(
             REG_USER_RB_ADDR, offset >> 3); // Translate byte offset to 64-bit offset
         return _iface->peek64(_rb_reg_addr);
@@ -49,7 +49,7 @@ public:
         if (offset % sizeof(uint32_t) != 0)
             throw uhd::value_error("poke32: Incorrect address alignment");
 
-        boost::unique_lock<boost::mutex> lock(_mutex);
+        std::unique_lock<std::mutex> lock(_mutex);
         _iface->poke32(
             REG_USER_SR_ADDR, offset >> 2); // Translate byte offset to 64-bit offset
         _iface->poke32(REG_USER_SR_DATA, value);
@@ -72,7 +72,7 @@ private:
     wb_iface::sptr _iface;
     const wb_addr_type _sr_base_addr;
     const wb_addr_type _rb_reg_addr;
-    boost::mutex _mutex;
+    std::mutex _mutex;
 };
 
 wb_iface::sptr user_settings_core_3000::make(