aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>2013-12-29 17:33:31 +0100
committerLorDClockaN <davor@losinj.com>2014-03-28 21:50:14 +0100
commit734b384dba2c6c7d2c16e78e0babb383e5f2200a (patch)
tree14428792651959b781bdec9a646c3b3abec5b947
parentbf0129a9283f0d1e50709b9008995ffe9f241436 (diff)
Don't implicitly cast NULL to a bool
The code is wrong and causes an error when building with clang 3.4 (-Werror,-Wnull-conversion) Change-Id: If03aa782fa25337802ff906a0d06071fbda93e26 Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
-rw-r--r--vm/reflect/Annotation.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/vm/reflect/Annotation.cpp b/vm/reflect/Annotation.cpp
index 942027c7b..bbd58e953 100644
--- a/vm/reflect/Annotation.cpp
+++ b/vm/reflect/Annotation.cpp
@@ -1288,7 +1288,7 @@ bool dvmIsClassAnnotationPresent(const ClassObject* clazz,
{
const DexAnnotationSetItem* pAnnoSet = findAnnotationSetForClass(clazz);
if (pAnnoSet == NULL) {
- return NULL;
+ return false;
}
const DexAnnotationItem* pAnnoItem = getAnnotationItemFromAnnotationSet(
clazz, pAnnoSet, kDexVisibilityRuntime, annotationClazz);
@@ -1743,7 +1743,7 @@ bool dvmIsMethodAnnotationPresent(const ClassObject* clazz,
{
const DexAnnotationSetItem* pAnnoSet = findAnnotationSetForMethod(method);
if (pAnnoSet == NULL) {
- return NULL;
+ return false;
}
const DexAnnotationItem* pAnnoItem = getAnnotationItemFromAnnotationSet(
clazz, pAnnoSet, kDexVisibilityRuntime, annotationClazz);
@@ -2053,7 +2053,7 @@ bool dvmIsFieldAnnotationPresent(const ClassObject* clazz,
{
const DexAnnotationSetItem* pAnnoSet = findAnnotationSetForField(field);
if (pAnnoSet == NULL) {
- return NULL;
+ return false;
}
const DexAnnotationItem* pAnnoItem = getAnnotationItemFromAnnotationSet(
clazz, pAnnoSet, kDexVisibilityRuntime, annotationClazz);