From e906c610cc95c1df58ffd4b05f56153643f38b0b Mon Sep 17 00:00:00 2001
From: Ashish Chaudhari <ashish@ettus.com>
Date: Wed, 15 Oct 2014 12:23:32 -0700
Subject: nirio: Removed modern boost synchronization types to support older
 versions

- Replaced shared_lock_guard with shared_lock
- Replaced lock_guard with upgrade_lock and upgrade_to_unique_lock
---
 host/include/uhd/transport/nirio/niriok_proxy.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/host/include/uhd/transport/nirio/niriok_proxy.h b/host/include/uhd/transport/nirio/niriok_proxy.h
index 5ea796dec..07bcb59b6 100644
--- a/host/include/uhd/transport/nirio/niriok_proxy.h
+++ b/host/include/uhd/transport/nirio/niriok_proxy.h
@@ -22,8 +22,7 @@
 #include <boost/smart_ptr.hpp>
 #include <boost/noncopyable.hpp>
 #include <boost/thread/shared_mutex.hpp>
-#include <boost/thread/locks.hpp> 
-#include <boost/thread/shared_lock_guard.hpp>
+#include <boost/thread/locks.hpp>
 #include <uhd/transport/nirio/nirio_driver_iface.h>
 #include <uhd/transport/nirio/nirio_quirks.h>
 
@@ -43,10 +42,11 @@
 #define GET_FIFO_MEMORY_TYPE(fifo_inst) (static_cast<uint16_t>(0x0100 | static_cast<uint16_t>(fifo_inst)))
 
 #define READER_LOCK \
-    boost::shared_lock_guard<boost::shared_mutex> reader_lock(_synchronization);
+    boost::shared_lock<boost::shared_mutex> reader_lock(_synchronization);
 
 #define WRITER_LOCK \
-    boost::lock_guard<boost::shared_mutex> writer_lock(_synchronization);
+    boost::upgrade_lock<boost::shared_mutex> write_upgrade_lock(_synchronization);\
+    boost::upgrade_to_unique_lock<boost::shared_mutex> write_unique_lock(write_upgrade_lock);
 
 
 namespace uhd { namespace niusrprio
-- 
cgit v1.2.3