From 940b796bb44b3a87d0a0a8d09f94e20e32cf0889 Mon Sep 17 00:00:00 2001
From: Leith Bade <leith@mapbox.com>
Date: Sat, 15 Nov 2014 20:08:18 +1100
Subject: [PATCH] Revert "Add noncopyable"

This reverts commit 11061ee5da02650e36abbc4f558446db793d3df2.
---
 include/mbgl/platform/default/glfw_view.hpp        | 3 +--
 include/mbgl/platform/default/headless_display.hpp | 3 +--
 include/mbgl/platform/default/headless_view.hpp    | 3 +--
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/include/mbgl/platform/default/glfw_view.hpp b/include/mbgl/platform/default/glfw_view.hpp
index c63b205a4..6e91c1125 100644
--- a/include/mbgl/platform/default/glfw_view.hpp
+++ b/include/mbgl/platform/default/glfw_view.hpp
@@ -3,14 +3,13 @@
 
 #include <mbgl/mbgl.hpp>
 #include <mbgl/util/time.hpp>
-#include <mbgl/util/noncopyable.hpp>
 
 #ifdef NVIDIA
 #define GLFW_INCLUDE_ES2
 #endif
 #include <GLFW/glfw3.h>
 
-class GLFWView : public mbgl::View, private mbgl::util::noncopyable {
+class GLFWView : public mbgl::View {
 public:
     GLFWView(bool fullscreen = false);
     ~GLFWView();
diff --git a/include/mbgl/platform/default/headless_display.hpp b/include/mbgl/platform/default/headless_display.hpp
index cd6cb4f75..5b33fd699 100644
--- a/include/mbgl/platform/default/headless_display.hpp
+++ b/include/mbgl/platform/default/headless_display.hpp
@@ -1,12 +1,11 @@
 #ifndef MBGL_COMMON_HEADLESS_DISPLAY
 #define MBGL_COMMON_HEADLESS_DISPLAY
 
-#include <mbgl/util/noncopyable.hpp>
 #include "headless_view.hpp"
 
 namespace mbgl {
 
-class HeadlessDisplay, private mbgl::util::noncopyable {
+class HeadlessDisplay {
 public:
     HeadlessDisplay();
     ~HeadlessDisplay();
diff --git a/include/mbgl/platform/default/headless_view.hpp b/include/mbgl/platform/default/headless_view.hpp
index 9ecdf695e..9d8acf70f 100644
--- a/include/mbgl/platform/default/headless_view.hpp
+++ b/include/mbgl/platform/default/headless_view.hpp
@@ -9,7 +9,6 @@
 #define MBGL_USE_GLX 1
 #endif
 
-#include <mbgl/util/noncopyable.hpp>
 #include <mbgl/map/view.hpp>
 #include <mbgl/platform/gl.hpp>
 
@@ -19,7 +18,7 @@ namespace mbgl {
 
 class HeadlessDisplay;
 
-class HeadlessView : public View, private util::noncopyable {
+class HeadlessView : public View {
 public:
     HeadlessView();
     HeadlessView(std::shared_ptr<HeadlessDisplay> display);