diff options
| author |  tfarina@chromium.org <tfarina@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-12-03 14:38:08 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-12-03 14:38:08 +0000 |
| commit | 1d3c411f5e4d2ad31bc92b3a85957004329ac00d (patch) | |
| tree | 1b65ba7a939caee48d0402b59c5b1ce68abbe976 /src/animator/SkDrawGroup.cpp | |
| parent | 0da23a5184cf8ee658c4f1ac45b798ddf7e73002 (diff) | |
Fix clang 'overloaded-virtual' warnings.
This patch fixes the warning like the following:
../../src/animator/SkPaintParts.h:26:18: warning: 'SkPaintPart::add' hides overloaded virtual function [-Woverloaded-virtual]
virtual bool add() = 0;
^
../../src/animator/SkDisplayable.h:35:18: note: hidden overloaded virtual function 'SkDisplayable::add' declared here
virtual bool add(SkAnimateMaker& , SkDisplayable* child);
^
R=robertphillips@google.com,
Review URL: https://codereview.appspot.com/6843134
git-svn-id: http://skia.googlecode.com/svn/trunk@6642 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/animator/SkDrawGroup.cpp')
| -rw-r--r-- | src/animator/SkDrawGroup.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/animator/SkDrawGroup.cpp b/src/animator/SkDrawGroup.cpp index 806da5eb07..ddd23d3526 100644 --- a/src/animator/SkDrawGroup.cpp +++ b/src/animator/SkDrawGroup.cpp @@ -49,7 +49,7 @@ SkGroup::~SkGroup() { } } -bool SkGroup::add(SkAnimateMaker& , SkDisplayable* child) { +bool SkGroup::addChild(SkAnimateMaker& , SkDisplayable* child) { SkASSERT(child); // SkASSERT(child->isDrawable()); *fChildren.append() = (SkDrawable*) child; @@ -86,7 +86,7 @@ SkDisplayable* SkGroup::deepCopy(SkAnimateMaker* maker) { for (SkDrawable** ptr = fChildren.begin(); ptr < fChildren.end(); ptr++) { SkDisplayable* displayable = (SkDisplayable*)*ptr; SkDisplayable* deeperCopy = displayable->deepCopy(maker); - ((SkGroup*)copy)->add(*maker, deeperCopy); + ((SkGroup*)copy)->addChild(*maker, deeperCopy); } return copy; } |