diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-09-18 13:00:55 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-09-18 13:00:55 +0000 |
| commit | a0b40280a49a8a43af7929ead3b3489951c58501 (patch) | |
| tree | b9b037c113ff7b1094ef7f3ab96fa74d5ccf99fe /src/gpu/GrAllocator.h | |
| parent | 0694ea7f6a16e946972b9c625f434e80eb42bb5f (diff) | |
Replace uses of GrNoncopyable by SkNoncopyable.
BUG=None
TEST=None, no functional changes.
R=bsalomon@google.com, robertphillips@google.com
Author: tfarina@chromium.org
Review URL: https://chromiumcodereview.appspot.com/23483042
git-svn-id: http://skia.googlecode.com/svn/trunk@11341 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/gpu/GrAllocator.h')
| -rwxr-xr-x | src/gpu/GrAllocator.h | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/src/gpu/GrAllocator.h b/src/gpu/GrAllocator.h index c37b119700..57ca03cd32 100755 --- a/src/gpu/GrAllocator.h +++ b/src/gpu/GrAllocator.h @@ -1,4 +1,3 @@ - /* * Copyright 2010 Google Inc. * @@ -6,16 +5,15 @@ * found in the LICENSE file. */ - - #ifndef GrAllocator_DEFINED #define GrAllocator_DEFINED -#include "GrNoncopyable.h" #include "GrConfig.h" +#include "GrTypes.h" #include "SkTArray.h" +#include "SkTypes.h" -class GrAllocator : GrNoncopyable { +class GrAllocator : public SkNoncopyable { public: ~GrAllocator() { reset(); @@ -135,12 +133,11 @@ private: bool fOwnFirstBlock; int fCount; - typedef GrNoncopyable INHERITED; + typedef SkNoncopyable INHERITED; }; template <typename T> -class GrTAllocator : GrNoncopyable { - +class GrTAllocator : public SkNoncopyable { public: virtual ~GrTAllocator() { this->reset(); }; @@ -232,7 +229,7 @@ protected: private: GrAllocator fAllocator; - typedef GrNoncopyable INHERITED; + typedef SkNoncopyable INHERITED; }; template <int N, typename T> class GrSTAllocator : public GrTAllocator<T> { |