Revert "Add noncopyable"

This reverts commit 11061ee5da.
This commit is contained in:
Leith Bade
2014-11-15 20:08:18 +11:00
parent bd9d7fe776
commit 940b796bb4
3 changed files with 3 additions and 6 deletions

View File

@@ -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();

View File

@@ -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();

View File

@@ -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);