diff options
| author |  Ben Wagner <bungeman@google.com> | 2018-07-16 17:44:06 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-07-17 21:39:51 +0000 |
| commit | d5148e331436b69e3de1a35d4bfa8492e89b3cce (patch) | |
| tree | fdf0a1dc5c8347ea75d57b0ed55af835f3a31d40 /include/private | |
| parent | 21a99d42c34f44dac4a71cace9572dc244cad583 (diff) | |
Move SkNoncopyable to include/private.
Change-Id: I62f60ea52faeebddecacf03d9429ac3f7c516b8e
Reviewed-on: https://skia-review.googlesource.com/141823
Commit-Queue: Ben Wagner <bungeman@google.com>
Reviewed-by: Ben Wagner <bungeman@google.com>
Diffstat (limited to 'include/private')
| -rw-r--r-- | include/private/GrSurfaceProxy.h | 1 | ||||
| -rw-r--r-- | include/private/GrSurfaceProxyRef.h | 1 | ||||
| -rw-r--r-- | include/private/SkAtomics.h | 1 | ||||
| -rw-r--r-- | include/private/SkChecksum.h | 1 | ||||
| -rw-r--r-- | include/private/SkMessageBus.h | 1 | ||||
| -rw-r--r-- | include/private/SkNoncopyable.h | 30 | ||||
| -rw-r--r-- | include/private/SkTInternalLList.h | 1 |
7 files changed, 36 insertions, 0 deletions
diff --git a/include/private/GrSurfaceProxy.h b/include/private/GrSurfaceProxy.h index 9499edfde3..94626265ac 100644 --- a/include/private/GrSurfaceProxy.h +++ b/include/private/GrSurfaceProxy.h @@ -8,6 +8,7 @@ #ifndef GrSurfaceProxy_DEFINED #define GrSurfaceProxy_DEFINED +#include "../private/SkNoncopyable.h" #include "GrGpuResource.h" #include "GrSurface.h" diff --git a/include/private/GrSurfaceProxyRef.h b/include/private/GrSurfaceProxyRef.h index 2319357251..38d5827614 100644 --- a/include/private/GrSurfaceProxyRef.h +++ b/include/private/GrSurfaceProxyRef.h @@ -8,6 +8,7 @@ #ifndef GrSurfaceProxyRef_DEFINED #define GrSurfaceProxyRef_DEFINED +#include "../private/SkNoncopyable.h" #include "GrTypesPriv.h" class GrSurfaceProxy; diff --git a/include/private/SkAtomics.h b/include/private/SkAtomics.h index 56272e25e6..075d4c0695 100644 --- a/include/private/SkAtomics.h +++ b/include/private/SkAtomics.h @@ -9,6 +9,7 @@ #define SkAtomics_DEFINED // This file is not part of the public Skia API. +#include "../private/SkNoncopyable.h" #include "SkTypes.h" #include <atomic> diff --git a/include/private/SkChecksum.h b/include/private/SkChecksum.h index 8a04c89ae7..fceb86bc30 100644 --- a/include/private/SkChecksum.h +++ b/include/private/SkChecksum.h @@ -8,6 +8,7 @@ #ifndef SkChecksum_DEFINED #define SkChecksum_DEFINED +#include "../private/SkNoncopyable.h" #include "SkString.h" #include "SkTLogic.h" #include "SkTypes.h" diff --git a/include/private/SkMessageBus.h b/include/private/SkMessageBus.h index 418235d68e..9fe060d12f 100644 --- a/include/private/SkMessageBus.h +++ b/include/private/SkMessageBus.h @@ -8,6 +8,7 @@ #ifndef SkMessageBus_DEFINED #define SkMessageBus_DEFINED +#include "../private/SkNoncopyable.h" #include "SkMutex.h" #include "SkOnce.h" #include "SkTArray.h" diff --git a/include/private/SkNoncopyable.h b/include/private/SkNoncopyable.h new file mode 100644 index 0000000000..518b3eeb92 --- /dev/null +++ b/include/private/SkNoncopyable.h @@ -0,0 +1,30 @@ +/* + * Copyright 2006 The Android Open Source Project + * + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. + */ + +#ifndef SkNoncopyable_DEFINED +#define SkNoncopyable_DEFINED + +#include "SkTypes.h" + +/** \class SkNoncopyable + + SkNoncopyable is the base class for objects that do not want to + be copied. It hides its copy-constructor and its assignment-operator. +*/ +class SK_API SkNoncopyable { +public: + SkNoncopyable() = default; + + SkNoncopyable(SkNoncopyable&&) = default; + SkNoncopyable& operator =(SkNoncopyable&&) = default; + +private: + SkNoncopyable(const SkNoncopyable&) = delete; + SkNoncopyable& operator=(const SkNoncopyable&) = delete; +}; + +#endif diff --git a/include/private/SkTInternalLList.h b/include/private/SkTInternalLList.h index 2f43f1c1eb..547befe694 100644 --- a/include/private/SkTInternalLList.h +++ b/include/private/SkTInternalLList.h @@ -8,6 +8,7 @@ #ifndef SkTInternalLList_DEFINED #define SkTInternalLList_DEFINED +#include "../private/SkNoncopyable.h" #include "SkTypes.h" /** |