| Index: src/gpu/GrTemplates.h
|
| diff --git a/src/gpu/GrTemplates.h b/src/gpu/GrTemplates.h
|
| index 69720dc111ac4b15087d35fd773eb6f3525485cd..5a009dfdf109fed9977d24d5b4a78d5419ab1766 100644
|
| --- a/src/gpu/GrTemplates.h
|
| +++ b/src/gpu/GrTemplates.h
|
| @@ -1,4 +1,3 @@
|
| -
|
| /*
|
| * Copyright 2010 Google Inc.
|
| *
|
| @@ -6,11 +5,10 @@
|
| * found in the LICENSE file.
|
| */
|
|
|
| -
|
| #ifndef GrTemplates_DEFINED
|
| #define GrTemplates_DEFINED
|
|
|
| -#include "GrNoncopyable.h"
|
| +#include "SkTypes.h"
|
|
|
| /**
|
| * Use to cast a ptr to a different type, and maintain strict-aliasing
|
| @@ -37,7 +35,7 @@ template <typename Dst, typename Src> Dst GrTCast(Src src) {
|
| * ...
|
| * } // fCount is restored
|
| */
|
| -template <typename T> class GrAutoTRestore : public GrNoncopyable {
|
| +template <typename T> class GrAutoTRestore : public SkNoncopyable {
|
| public:
|
| GrAutoTRestore() : fPtr(NULL), fVal() {}
|
|
|
|
|