Reduce include bloat by including boost/thread/{locks,shared_mutex}.hpp directly

diff --git a/pv/devicemanager.cpp b/pv/devicemanager.cpp
index 17a49774465c3d90fa7c8e3171d10bd4900c33f1..f1f4c542ca227bca236f050f9e226f30c7271422 100644 (file)
--- 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 6c122b1c2bbaf16b31c488797e46e72e594c4834..3cf2ff40ae2591333519367bb03b9cc6e70a3a95 100644 (file)
--- 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 4823543213de5b5a080be2ea732d1086aefa4bae..0b503e056a83f6bc471aaf3c14612e3682cbbb97 100644 (file)
--- 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 3d303da47f198a6b3f88d046298126b4d5453270..689b3f832dcf40752f789fb9f3bc59db2e64bc98 100644 (file)
--- 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 9a30c24379b37a691af0750640997211ee725603..35582b43a411d92ced14ba45e3b7a124b320d3a0 100644 (file)
--- 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 c0c4d167e109f17f16eeb374aba8420d863dd86f..f44d8f94b75ea0991fb6791dd5dc51a975f49a7a 100644 (file)
--- 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 1b8926ca90a0d35a2df9c20b6d44cf0165f57393..10de80a03060bde9323eb4e549ff1aede26b4a49 100644 (file)
--- 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 4b17a56f2fded2b7d8031e76e100d4b8e601db18..3eb04920ef8f364ac19bd299f0f51a4e81039177 100644 (file)
--- 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>