diff options
| author | Alexander Ivchenko <alexander.ivchenko@intel.com> | 2014-06-26 16:32:11 +0400 |
|---|---|---|
| committer | Alexander Ivchenko <alexander.ivchenko@intel.com> | 2014-06-26 16:34:45 +0400 |
| commit | bacce5c9324497c77f8196069e692077a2e57591 (patch) | |
| tree | 897fb2610d6cccaf71027e54bd72dba715f481c0 /runtime/dex_file.cc | |
| parent | b1cbf58b4d0bfe58d1ac8716c1d5c4c646983478 (diff) | |
| download | android_art-bacce5c9324497c77f8196069e692077a2e57591.tar.gz android_art-bacce5c9324497c77f8196069e692077a2e57591.tar.bz2 android_art-bacce5c9324497c77f8196069e692077a2e57591.zip | |
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>
Diffstat (limited to 'runtime/dex_file.cc')
| -rw-r--r-- | runtime/dex_file.cc | 2 |
1 files changed, 1 insertions, 1 deletions
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 { |