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
diff --git a/src/gpu/GrAllocator.h b/src/gpu/GrAllocator.h
index c37b119..57ca03c 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 @@
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 @@
private:
GrAllocator fAllocator;
- typedef GrNoncopyable INHERITED;
+ typedef SkNoncopyable INHERITED;
};
template <int N, typename T> class GrSTAllocator : public GrTAllocator<T> {