From 11061ee5da02650e36abbc4f558446db793d3df2 Mon Sep 17 00:00:00 2001 From: Leith Bade Date: Wed, 12 Nov 2014 22:01:32 +1100 Subject: [PATCH] Add noncopyable --- 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, 6 insertions(+), 3 deletions(-) diff --git a/include/mbgl/platform/default/glfw_view.hpp b/include/mbgl/platform/default/glfw_view.hpp index 6e91c1125..c63b205a4 100644 --- a/include/mbgl/platform/default/glfw_view.hpp +++ b/include/mbgl/platform/default/glfw_view.hpp @@ -3,13 +3,14 @@ #include #include +#include #ifdef NVIDIA #define GLFW_INCLUDE_ES2 #endif #include -class GLFWView : public mbgl::View { +class GLFWView : public mbgl::View, private mbgl::util::noncopyable { 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 5b33fd699..cd6cb4f75 100644 --- a/include/mbgl/platform/default/headless_display.hpp +++ b/include/mbgl/platform/default/headless_display.hpp @@ -1,11 +1,12 @@ #ifndef MBGL_COMMON_HEADLESS_DISPLAY #define MBGL_COMMON_HEADLESS_DISPLAY +#include #include "headless_view.hpp" namespace mbgl { -class HeadlessDisplay { +class HeadlessDisplay, private mbgl::util::noncopyable { public: HeadlessDisplay(); ~HeadlessDisplay(); diff --git a/include/mbgl/platform/default/headless_view.hpp b/include/mbgl/platform/default/headless_view.hpp index f599dde27..0a058552e 100644 --- a/include/mbgl/platform/default/headless_view.hpp +++ b/include/mbgl/platform/default/headless_view.hpp @@ -9,6 +9,7 @@ #define MBGL_USE_GLX 1 #endif +#include #include #include @@ -18,7 +19,7 @@ namespace mbgl { class HeadlessDisplay; -class HeadlessView : public View { +class HeadlessView : public View, private util::noncopyable { public: HeadlessView(); HeadlessView(std::shared_ptr display);