diff options
| author | Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org> | 2013-12-29 17:33:31 +0100 |
|---|---|---|
| committer | Steve Kondik <shade@chemlab.org> | 2014-02-02 02:04:06 -0800 |
| commit | 15932a7980a0090d5e2fc2eb6d4e520872168ab3 (patch) | |
| tree | 332061bf48fae3d81b6e58369f2f307841c5dd0f | |
| parent | eadd85e3c0eceb448f4afb55ab6ef4b5f3b7736a (diff) | |
| download | android_dalvik-15932a7980a0090d5e2fc2eb6d4e520872168ab3.tar.gz android_dalvik-15932a7980a0090d5e2fc2eb6d4e520872168ab3.tar.bz2 android_dalvik-15932a7980a0090d5e2fc2eb6d4e520872168ab3.zip | |
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.cpp | 6 |
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); |