AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix G3 opt android_arm build?

Browse Source 
We suspect that having SkTDPQueue inherit from SkNoncopyable is
what's causing this error:

third_party/skia/HEAD/src/gpu/GrResourceCache.h:44:7: error: 'GrResourceCache' declared with greater visibility than the type of its field 'GrResourceCache::fPurgeableQueue' [-Werror=attributes]
 class GrResourceCache {
       ^

Change-Id: Idc737aa64f5cb159edbe59e8baf70d711f7e07d9
Reviewed-on: https://skia-review.googlesource.com/15243
Commit-Queue: Mike Klein <mtklein@chromium.org>
Reviewed-by: Ben Wagner <benjaminwagner@google.com>
This commit is contained in:
Mike Klein 2017-05-03 15:55:10 -04:00 committed by Skia Commit-Bot
parent 69b1045ce2
commit bc4c96bc65
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/core/SkTDPQueue.h
View File

@ -24,10 +24,16 @@
template <typename T,
bool (*LESS)(const T&, const T&),
int* (*INDEX)(const T&) = (int* (*)(const T&))nullptr>
class SkTDPQueue : public SkNoncopyable {
class SkTDPQueue {
public:
SkTDPQueue() {}
SkTDPQueue(SkTDPQueue&&) = default;
SkTDPQueue& operator =(SkTDPQueue&&) = default;
SkTDPQueue(const SkTDPQueue&) = delete;
SkTDPQueue& operator=(const SkTDPQueue&) = delete;
/** Number of items in the queue. */
int count() const { return fArray.count(); }
@ -188,8 +194,6 @@ private:
}
SkTDArray<T> fArray;
typedef SkNoncopyable INHERITED;
};
#endif