summaryrefslogtreecommitdiff
path: root/libs/ui/FramebufferNativeWindow.cpp
diff options
context:
space:
mode:
author Mark Salyzyn <salyzyn@google.com> 2014-03-13 23:12:09 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2014-03-13 23:12:09 +0000
commit993146092f8205d9747f082ccd63c09b536caa4e (patch)
tree89d07eb2647268606632e10e6c9add64b30f7b84 /libs/ui/FramebufferNativeWindow.cpp
parent49bfda1fbdf828a8ea63ae2c2fa25739f6e48527 (diff)
parentd4dabf872ac0a12e12aebae9032f7d62762c2aeb (diff)
am d4dabf87: am cdbf28b3: Merge "native frameworks: 64-bit compile issues"
* commit 'd4dabf872ac0a12e12aebae9032f7d62762c2aeb': native frameworks: 64-bit compile issues
Diffstat (limited to 'libs/ui/FramebufferNativeWindow.cpp')
-rw-r--r--libs/ui/FramebufferNativeWindow.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/libs/ui/FramebufferNativeWindow.cpp b/libs/ui/FramebufferNativeWindow.cpp
index 31a69b2119..918f2e7567 100644
--- a/libs/ui/FramebufferNativeWindow.cpp
+++ b/libs/ui/FramebufferNativeWindow.cpp
@@ -259,8 +259,8 @@ int FramebufferNativeWindow::dequeueBuffer(ANativeWindow* window,
return 0;
}
-int FramebufferNativeWindow::lockBuffer_DEPRECATED(ANativeWindow* window,
- ANativeWindowBuffer* buffer)
+int FramebufferNativeWindow::lockBuffer_DEPRECATED(ANativeWindow* /*window*/,
+ ANativeWindowBuffer* /*buffer*/)
{
return NO_ERROR;
}
@@ -326,7 +326,7 @@ int FramebufferNativeWindow::query(const ANativeWindow* window,
return BAD_VALUE;
}
-int FramebufferNativeWindow::perform(ANativeWindow* window,
+int FramebufferNativeWindow::perform(ANativeWindow* /*window*/,
int operation, ...)
{
switch (operation) {