2 files changed, 7 insertions, 7 deletions
diff --git a/host/lib/transport/nirio/niusrprio_session.cpp b/host/lib/transport/nirio/niusrprio_session.cpp
index b2ea659df..00838075f 100644
--- a/host/lib/transport/nirio/niusrprio_session.cpp
+++ b/host/lib/transport/nirio/niusrprio_session.cpp
@@ -51,7 +51,7 @@ nirio_status niusrprio_session::enumerate(
 
 nirio_status niusrprio_session::open(nifpga_lvbitx::sptr lvbitx, bool force_download)
 {
-    boost::unique_lock<boost::recursive_mutex> lock(_session_mutex);
+    std::unique_lock<std::recursive_mutex> lock(_session_mutex);
 
     _lvbitx = lvbitx;
 
@@ -101,7 +101,7 @@ nirio_status niusrprio_session::open(nifpga_lvbitx::sptr lvbitx, bool force_down
 
 void niusrprio_session::close(bool skip_reset)
 {
-    boost::unique_lock<boost::recursive_mutex> lock(_session_mutex);
+    std::unique_lock<std::recursive_mutex> lock(_session_mutex);
 
     if (_session_open) {
         nirio_status status = NiRio_Status_Success;
@@ -114,14 +114,14 @@ void niusrprio_session::close(bool skip_reset)
 
 nirio_status niusrprio_session::reset()
 {
-    boost::unique_lock<boost::recursive_mutex> lock(_session_mutex);
+    std::unique_lock<std::recursive_mutex> lock(_session_mutex);
     return _rpc_client.niusrprio_reset_device(_resource_name);
 }
 
 nirio_status niusrprio_session::download_bitstream_to_flash(
     const std::string& bitstream_path)
 {
-    boost::unique_lock<boost::recursive_mutex> lock(_session_mutex);
+    std::unique_lock<std::recursive_mutex> lock(_session_mutex);
     return _rpc_client.niusrprio_download_fpga_to_flash(_resource_name, bitstream_path);
 }
 
diff --git a/host/lib/transport/nirio/rpc/rpc_client.cpp b/host/lib/transport/nirio/rpc/rpc_client.cpp
index 661f72e81..7b5970610 100644
--- a/host/lib/transport/nirio/rpc/rpc_client.cpp
+++ b/host/lib/transport/nirio/rpc/rpc_client.cpp
@@ -109,7 +109,7 @@ const boost::system::error_code& rpc_client::call(func_id_t func_id,
     func_args_reader_t& out_args,
     boost::posix_time::milliseconds timeout)
 {
-    boost::mutex::scoped_lock lock(_mutex);
+    std::unique_lock<std::mutex> lock(_mutex);
 
     if (_io_service_thread.get()) {
         _request.header.func_id = func_id;
@@ -168,7 +168,7 @@ const boost::system::error_code& rpc_client::call(func_id_t func_id,
 void rpc_client::_handle_response_hdr(
     const boost::system::error_code& err, size_t transferred, size_t expected)
 {
-    boost::mutex::scoped_lock lock(_mutex);
+    std::lock_guard<std::mutex> lock(_mutex);
     _exec_err = err;
     if (!_exec_err && (transferred == expected)) {
         // Response header received. Verify that it is expected
@@ -205,7 +205,7 @@ void rpc_client::_handle_response_hdr(
 void rpc_client::_handle_response_data(
     const boost::system::error_code& err, size_t transferred, size_t expected)
 {
-    boost::mutex::scoped_lock lock(_mutex);
+    std::lock_guard<std::mutex> lock(_mutex);
     _exec_err = err;
     if (transferred != expected) {
         _exec_err.assign(boost::asio::error::operation_aborted,