diff options
| author | Andreas Gampe <agampe@google.com> | 2014-11-03 21:36:10 -0800 |
|---|---|---|
| committer | Andreas Gampe <agampe@google.com> | 2014-11-04 18:40:08 -0800 |
| commit | 277ccbd200ea43590dfc06a93ae184a765327ad0 (patch) | |
| tree | d89712e93da5fb2748989353c9ee071102cf3f33 /dex2oat | |
| parent | ad17d41841ba1fb177fb0bf175ec0e9f5e1412b3 (diff) | |
| download | art-277ccbd200ea43590dfc06a93ae184a765327ad0.tar.gz art-277ccbd200ea43590dfc06a93ae184a765327ad0.tar.bz2 art-277ccbd200ea43590dfc06a93ae184a765327ad0.zip | |
ART: More warnings
Enable -Wno-conversion-null, -Wredundant-decls and -Wshadow in general,
and -Wunused-but-set-parameter for GCC builds.
Change-Id: I81bbdd762213444673c65d85edae594a523836e5
Diffstat (limited to 'dex2oat')
| -rw-r--r-- | dex2oat/dex2oat.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/dex2oat/dex2oat.cc b/dex2oat/dex2oat.cc index 30dfdf048d..7770588ec2 100644 --- a/dex2oat/dex2oat.cc +++ b/dex2oat/dex2oat.cc @@ -1065,8 +1065,8 @@ static int dex2oat(int argc, char** argv) { } else if (option == "--print-all-passes") { PassDriverMEOpts::SetPrintAllPasses(); } else if (option.starts_with("--dump-cfg-passes=")) { - std::string dump_passes = option.substr(strlen("--dump-cfg-passes=")).data(); - PassDriverMEOpts::SetDumpPassList(dump_passes); + std::string dump_passes_string = option.substr(strlen("--dump-cfg-passes=")).data(); + PassDriverMEOpts::SetDumpPassList(dump_passes_string); } else if (option == "--print-pass-options") { print_pass_options = true; } else if (option.starts_with("--pass-options=")) { @@ -1337,7 +1337,6 @@ static int dex2oat(int argc, char** argv) { // If --image-classes was specified, calculate the full list of classes to include in the image std::unique_ptr<std::set<std::string>> image_classes(nullptr); if (image_classes_filename != nullptr) { - std::string error_msg; if (image_classes_zip_filename != nullptr) { image_classes.reset(dex2oat->ReadImageClassesFromZip(image_classes_zip_filename, image_classes_filename, @@ -1360,7 +1359,6 @@ static int dex2oat(int argc, char** argv) { } else { if (dex_filenames.empty()) { ATRACE_BEGIN("Opening zip archive from file descriptor"); - std::string error_msg; std::unique_ptr<ZipArchive> zip_archive(ZipArchive::OpenFromFd(zip_fd, zip_location.c_str(), &error_msg)); if (zip_archive.get() == nullptr) { |