From e71eb81c946c3524e01eaef9781ccbf170143d0c Mon Sep 17 00:00:00 2001
From: Joel Holdsworth <joel@airwebreathe.org.uk>
Date: Sun, 16 Aug 2015 19:12:57 -0600
Subject: [PATCH] Reduce include bloat by including
 boost/thread/{locks,shared_mutex}.hpp directly

---
 pv/devicemanager.cpp        | 2 ++
 pv/popups/channels.cpp      | 3 +++
 pv/session.cpp              | 3 +++
 pv/session.hpp              | 2 +-
 pv/storesession.cpp         | 3 +++
 pv/view/decodetrace.cpp     | 2 ++
 pv/view/rowitemiterator.hpp | 3 ++-
 pv/view/view.cpp            | 2 ++
 8 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/pv/devicemanager.cpp b/pv/devicemanager.cpp
index 17a49774..f1f4c542 100644
--- a/pv/devicemanager.cpp
+++ b/pv/devicemanager.cpp
@@ -41,6 +41,8 @@ using std::bind;
 using std::dynamic_pointer_cast;
 using std::list;
 using std::map;
+using std::placeholders::_1;
+using std::placeholders::_2;
 using std::remove_if;
 using std::runtime_error;
 using std::shared_ptr;
diff --git a/pv/popups/channels.cpp b/pv/popups/channels.cpp
index 6c122b1c..3cf2ff40 100644
--- a/pv/popups/channels.cpp
+++ b/pv/popups/channels.cpp
@@ -20,6 +20,9 @@
 
 #include <map>
 
+#include <boost/thread/locks.hpp>
+#include <boost/thread/shared_mutex.hpp>
+
 #include <QCheckBox>
 #include <QFormLayout>
 #include <QGridLayout>
diff --git a/pv/session.cpp b/pv/session.cpp
index 48235432..0b503e05 100644
--- a/pv/session.cpp
+++ b/pv/session.cpp
@@ -18,6 +18,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
+#include <boost/thread/locks.hpp>
+#include <boost/thread/shared_mutex.hpp>
+
 #ifdef ENABLE_DECODE
 #include <libsigrokdecode/libsigrokdecode.h>
 #endif
diff --git a/pv/session.hpp b/pv/session.hpp
index 3d303da4..689b3f83 100644
--- a/pv/session.hpp
+++ b/pv/session.hpp
@@ -35,7 +35,7 @@
 #define NOGDI
 #define NORESOURCE
 #endif
-#include <boost/thread.hpp>
+#include <boost/thread/shared_mutex.hpp>
 
 #include <QObject>
 #include <QString>
diff --git a/pv/storesession.cpp b/pv/storesession.cpp
index 9a30c243..35582b43 100644
--- a/pv/storesession.cpp
+++ b/pv/storesession.cpp
@@ -20,6 +20,9 @@
 
 #include <cassert>
 
+#include <boost/thread/locks.hpp>
+#include <boost/thread/shared_mutex.hpp>
+
 #include "storesession.hpp"
 
 #include <pv/devicemanager.hpp>
diff --git a/pv/view/decodetrace.cpp b/pv/view/decodetrace.cpp
index c0c4d167..f44d8f94 100644
--- a/pv/view/decodetrace.cpp
+++ b/pv/view/decodetrace.cpp
@@ -29,6 +29,8 @@ extern "C" {
 #include <tuple>
 
 #include <boost/functional/hash.hpp>
+#include <boost/thread/locks.hpp>
+#include <boost/thread/shared_mutex.hpp>
 
 #include <QAction>
 #include <QApplication>
diff --git a/pv/view/rowitemiterator.hpp b/pv/view/rowitemiterator.hpp
index 1b8926ca..10de80a0 100644
--- a/pv/view/rowitemiterator.hpp
+++ b/pv/view/rowitemiterator.hpp
@@ -34,7 +34,8 @@
 #define NOGDI
 #define NORESOURCE
 #endif
-#include <boost/thread.hpp>
+#include <boost/thread/locks.hpp>
+#include <boost/thread/shared_mutex.hpp>
 
 #include <pv/session.hpp>
 
diff --git a/pv/view/view.cpp b/pv/view/view.cpp
index 4b17a56f..3eb04920 100644
--- a/pv/view/view.cpp
+++ b/pv/view/view.cpp
@@ -32,6 +32,8 @@
 #include <mutex>
 #include <unordered_set>
 
+#include <boost/thread/locks.hpp>
+
 #include <QApplication>
 #include <QEvent>
 #include <QFontMetrics>
-- 
2.30.2