diff options
| author | Ian Rogers <irogers@google.com> | 2013-12-31 18:28:54 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-12-31 18:28:54 +0000 |
| commit | 704e08c3f2f1bbfdfc2c8d5a3ce1afdba0ec20d8 (patch) | |
| tree | e90b5acdcb7c07cdcefd6ffe974f480fa0d06be3 | |
| parent | ac743b5404eca3551b360fc73c710a5fb3852e0e (diff) | |
| parent | b382c7d42ce022c183f77121d361e574378c8e00 (diff) | |
| download | android_dalvik-704e08c3f2f1bbfdfc2c8d5a3ce1afdba0ec20d8.tar.gz android_dalvik-704e08c3f2f1bbfdfc2c8d5a3ce1afdba0ec20d8.tar.bz2 android_dalvik-704e08c3f2f1bbfdfc2c8d5a3ce1afdba0ec20d8.zip | |
Merge "Don't implicitly cast NULL to a bool"
| -rw-r--r-- | vm/compiler/Compiler.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vm/compiler/Compiler.cpp b/vm/compiler/Compiler.cpp index f5b96b1ef..04d645668 100644 --- a/vm/compiler/Compiler.cpp +++ b/vm/compiler/Compiler.cpp @@ -129,7 +129,7 @@ bool dvmCompilerWorkEnqueue(const u2 *pc, WorkOrderKind kind, void* info) newOrder->pc = pc; newOrder->kind = kind; newOrder->info = info; - newOrder->result.methodCompilationAborted = NULL; + newOrder->result.methodCompilationAborted = false; newOrder->result.codeAddress = NULL; newOrder->result.discardResult = (kind == kWorkOrderTraceDebug) ? true : false; |