2.1.0: layer: is now noncopyable.

git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches/2.1.0@2217 362d55ac-95cf-4e76-9f9a-cbaa9c17b72d

diff --git a/core/producer/layer.cpp b/core/producer/layer.cpp
index 276f891bdfb3515c86e1c0de31f0dabc2bb708c4..a80aed53ca6530db67ae62e548c18b9bc4eaed92 100644 (file)
--- a/core/producer/layer.cpp
+++ b/core/producer/layer.cpp
@@ -141,9 +141,8 @@ public:
 };\r
 \r
 layer::layer() : impl_(new impl()){}\r
-layer::layer(const layer& other) : impl_(new impl(*other.impl_)){}\r
 layer::layer(layer&& other) : impl_(std::move(other.impl_)){}\r
-layer& layer::operator=(layer other)\r
+layer& layer::operator=(layer&& other)\r
 {\r
        other.swap(*this);\r
        return *this;\r

diff --git a/core/producer/layer.h b/core/producer/layer.h
index fc5d8b6fa9391051d333bc1558ab8d045eef420a..4c1160724e86c8754f1f1f19d1a43379cde7067a 100644 (file)
--- a/core/producer/layer.h
+++ b/core/producer/layer.h
@@ -39,9 +39,8 @@ class layer sealed
 {\r
 public:\r
        layer(); // nothrow\r
-       layer(const layer&);\r
        layer(layer&& other); // nothrow\r
-       layer& operator=(layer other); // nothrow\r
+       layer& operator=(layer&& other); // nothrow\r
 \r
        void swap(layer& other); // nothrow \r
                \r