From f46a3ec40a691a6892ad5536ca47de175a9c05b7 Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Sun, 19 Mar 2017 10:24:19 +0100
Subject: Cleanup: Trim boost headers and unnecessary configure checks

---
 src/gui/GraphCanvas.cpp             | 2 +-
 src/gui/ThreadedLoader.hpp          | 2 +-
 src/server/Buffer.hpp               | 7 ++++---
 src/server/PluginImpl.hpp           | 7 ++++---
 src/server/events/DisconnectAll.cpp | 2 --
 5 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'src')

diff --git a/src/gui/GraphCanvas.cpp b/src/gui/GraphCanvas.cpp
index 6d22f407..37af8a5b 100644
--- a/src/gui/GraphCanvas.cpp
+++ b/src/gui/GraphCanvas.cpp
@@ -20,7 +20,7 @@
 #include <set>
 #include <string>
 
-#include <boost/format.hpp>
+#include <boost/optional.hpp>
 #include <gtkmm/stock.h>
 
 #include "ganv/Canvas.hpp"
diff --git a/src/gui/ThreadedLoader.hpp b/src/gui/ThreadedLoader.hpp
index 2f12a0e4..c0a4ed6a 100644
--- a/src/gui/ThreadedLoader.hpp
+++ b/src/gui/ThreadedLoader.hpp
@@ -23,7 +23,7 @@
 #include <list>
 #include <string>
 
-#include <boost/optional/optional.hpp>
+#include <boost/optional.hpp>
 #include <glibmm/thread.h>
 
 #include "ingen/Interface.hpp"
diff --git a/src/server/Buffer.hpp b/src/server/Buffer.hpp
index 07ec5ffb..13e0a7eb 100644
--- a/src/server/Buffer.hpp
+++ b/src/server/Buffer.hpp
@@ -20,8 +20,6 @@
 #include <atomic>
 #include <cassert>
 
-#include <boost/utility.hpp>
-
 #include "ingen/types.hpp"
 #include "ingen/ingen.h"
 #include "lv2/lv2plug.in/ns/ext/atom/atom.h"
@@ -39,7 +37,7 @@ class BufferFactory;
 class Engine;
 class RunContext;
 
-class INGEN_API Buffer : public boost::noncopyable
+class INGEN_API Buffer
 {
 public:
 	Buffer(BufferFactory& bufs,
@@ -226,6 +224,9 @@ protected:
 	~Buffer();
 
 private:
+	Buffer(const Buffer&) = delete;
+	Buffer& operator=(const Buffer&) = delete;
+
 	void recycle();
 
 	Buffer*               _next;      ///< Intrusive linked list for BufferFactory
diff --git a/src/server/PluginImpl.hpp b/src/server/PluginImpl.hpp
index 4f5c7eec..07798e45 100644
--- a/src/server/PluginImpl.hpp
+++ b/src/server/PluginImpl.hpp
@@ -19,8 +19,6 @@
 
 #include <cstdlib>
 
-#include <boost/utility.hpp>
-
 #include "ingen/Resource.hpp"
 #include "raul/Symbol.hpp"
 #include "raul/URI.hpp"
@@ -41,7 +39,6 @@ class GraphImpl;
  * Conceptually, a Block is an instance of this.
  */
 class PluginImpl : public Resource
-                 , public boost::noncopyable
 {
 public:
 	PluginImpl(Ingen::URIs&     uris,
@@ -91,6 +88,10 @@ protected:
 	Presets _presets;
 	bool    _presets_loaded;
 	bool    _is_zombie;
+
+private:
+	PluginImpl(const PluginImpl&) = delete;
+	PluginImpl& operator=(const PluginImpl&) = delete;
 };
 
 } // namespace Server
diff --git a/src/server/events/DisconnectAll.cpp b/src/server/events/DisconnectAll.cpp
index 16b62302..dc9652d9 100644
--- a/src/server/events/DisconnectAll.cpp
+++ b/src/server/events/DisconnectAll.cpp
@@ -16,8 +16,6 @@
 
 #include <set>
 
-#include <boost/format.hpp>
-
 #include "ingen/Store.hpp"
 #include "raul/Array.hpp"
 #include "raul/Maid.hpp"
-- 
cgit v1.2.1