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/core | |
| 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/core')
| -rw-r--r-- | include/core/SkColorSpaceXform.h | 1 | ||||
| -rw-r--r-- | include/core/SkDeque.h | 1 | ||||
| -rw-r--r-- | include/core/SkDrawLooper.h | 1 | ||||
| -rw-r--r-- | include/core/SkPictureRecorder.h | 1 | ||||
| -rw-r--r-- | include/core/SkTypeface.h | 1 | ||||
| -rw-r--r-- | include/core/SkTypes.h | 19 |
6 files changed, 5 insertions, 19 deletions
diff --git a/include/core/SkColorSpaceXform.h b/include/core/SkColorSpaceXform.h index bb838a264e..39c83d6c12 100644 --- a/include/core/SkColorSpaceXform.h +++ b/include/core/SkColorSpaceXform.h @@ -8,6 +8,7 @@ #ifndef SkColorSpaceXform_DEFINED #define SkColorSpaceXform_DEFINED +#include "../private/SkNoncopyable.h" #include "SkImageInfo.h" class SkColorSpace; diff --git a/include/core/SkDeque.h b/include/core/SkDeque.h index a00e3c2dfe..43023b8f5d 100644 --- a/include/core/SkDeque.h +++ b/include/core/SkDeque.h @@ -10,6 +10,7 @@ #ifndef SkDeque_DEFINED #define SkDeque_DEFINED +#include "../private/SkNoncopyable.h" #include "SkTypes.h" /* diff --git a/include/core/SkDrawLooper.h b/include/core/SkDrawLooper.h index fb7def7878..c6b2d6682c 100644 --- a/include/core/SkDrawLooper.h +++ b/include/core/SkDrawLooper.h @@ -10,6 +10,7 @@ #ifndef SkDrawLooper_DEFINED #define SkDrawLooper_DEFINED +#include "../private/SkNoncopyable.h" #include "SkBlurTypes.h" #include "SkFlattenable.h" #include "SkPoint.h" diff --git a/include/core/SkPictureRecorder.h b/include/core/SkPictureRecorder.h index cadd193afc..d28544c48c 100644 --- a/include/core/SkPictureRecorder.h +++ b/include/core/SkPictureRecorder.h @@ -8,6 +8,7 @@ #ifndef SkPictureRecorder_DEFINED #define SkPictureRecorder_DEFINED +#include "../private/SkNoncopyable.h" #include "SkBBHFactory.h" #include "SkPicture.h" #include "SkRefCnt.h" diff --git a/include/core/SkTypeface.h b/include/core/SkTypeface.h index 51f339ccfa..5604ce9c94 100644 --- a/include/core/SkTypeface.h +++ b/include/core/SkTypeface.h @@ -8,6 +8,7 @@ #ifndef SkTypeface_DEFINED #define SkTypeface_DEFINED +#include "../private/SkNoncopyable.h" #include "../private/SkOnce.h" #include "../private/SkWeakRefCnt.h" #include "SkFontArguments.h" diff --git a/include/core/SkTypes.h b/include/core/SkTypes.h index be51e20bac..01480509d6 100644 --- a/include/core/SkTypes.h +++ b/include/core/SkTypes.h @@ -237,23 +237,4 @@ enum class SkBackingFit { kExact }; -//////////////////////////////////////////////////////////////////////////////// - -/** \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 |