From bacce5c9324497c77f8196069e692077a2e57591 Mon Sep 17 00:00:00 2001
From: Alexander Ivchenko <alexander.ivchenko@intel.com>
Date: Thu, 26 Jun 2014 16:32:11 +0400
Subject: Return "false" instead of "nullptr" in bool DexFile::Open.

Otherwise on 4.10 the following error appears:
"error: converting to 'bool' from 'std::nullptr_t' requires direct-initialization [-fpermissive]"
Here is the detailed description with links:
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=52174

Change-Id: I77c6571b557dde55f4e19a79db7bf997303ede3b
Signed-off-by: Alexander Ivchenko <alexander.ivchenko@intel.com>
---
 runtime/dex_file.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'runtime/dex_file.cc')

diff --git a/runtime/dex_file.cc b/runtime/dex_file.cc
index d368e416f9..e5bc7c8c86 100644
--- a/runtime/dex_file.cc
+++ b/runtime/dex_file.cc
@@ -155,7 +155,7 @@ bool DexFile::Open(const char* filename, const char* location, std::string* erro
     }
   }
   *error_msg = StringPrintf("Expected valid zip or dex file: '%s'", filename);
-  return nullptr;
+  return false;
 }
 
 int DexFile::GetPermissions() const {
-- 
cgit v1.2.3