summaryrefslogtreecommitdiff
path: root/libs/hwui/RenderNode.cpp
diff options
context:
space:
mode:
author Andreas Gampe <agampe@google.com> 2014-11-21 21:38:42 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2014-11-21 21:38:42 +0000
commit99377df12ee696e01cd9071132f122801a9862ce (patch)
tree01769a67c494fe1f8264581d4f01e94705ce9c5f /libs/hwui/RenderNode.cpp
parente606a7884dff4acc926cb82bf6492e83e9a1d3af (diff)
parentd2738eadc1f8c92c64d47429ef3f168738431809 (diff)
am d2738ead: Merge "Frameworks/base: Unused parameters in hwui"
* commit 'd2738eadc1f8c92c64d47429ef3f168738431809': Frameworks/base: Unused parameters in hwui
Diffstat (limited to 'libs/hwui/RenderNode.cpp')
-rw-r--r--libs/hwui/RenderNode.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/hwui/RenderNode.cpp b/libs/hwui/RenderNode.cpp
index 22808e201889..28394e56dbb6 100644
--- a/libs/hwui/RenderNode.cpp
+++ b/libs/hwui/RenderNode.cpp
@@ -274,7 +274,7 @@ void RenderNode::pushStagingPropertiesChanges(TreeInfo& info) {
}
}
-void RenderNode::applyLayerPropertiesToLayer(TreeInfo& info) {
+void RenderNode::applyLayerPropertiesToLayer(TreeInfo& /* info */) {
if (CC_LIKELY(!mLayer)) return;
const LayerProperties& props = properties().layerProperties();
@@ -567,7 +567,7 @@ public:
operation->defer(mDeferStruct, saveCount, mLevel, clipToBounds);
}
inline LinearAllocator& allocator() { return *(mDeferStruct.mAllocator); }
- inline void startMark(const char* name) {} // do nothing
+ inline void startMark(const char* /* name */) {} // do nothing
inline void endMark() {}
inline int level() { return mLevel; }
inline int replayFlags() { return mDeferStruct.mReplayFlags; }