summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <treehugger-gerrit@google.com> 2018-01-19 02:39:29 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2018-01-19 02:39:29 +0000
commitf01528de9486c854b5e4da9994239b17b261084f (patch)
treeee3c548a5471c061f0a3183986f331cbe210f201
parenta780c6b65f92a60ff96da8895f4b8d23483283e3 (diff)
parentcc57c0cb24b1bba67dabf5af1d50ed3d47aab76b (diff)
Merge "Ignore frame-larger-than for Dex2oatArgumentMap::Parse"
-rw-r--r--dex2oat/dex2oat_options.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/dex2oat/dex2oat_options.cc b/dex2oat/dex2oat_options.cc
index d9b4ea7835..a2e2b48956 100644
--- a/dex2oat/dex2oat_options.cc
+++ b/dex2oat/dex2oat_options.cc
@@ -249,8 +249,6 @@ static Parser CreateArgumentParser() {
return parser_builder->Build();
}
-#pragma GCC diagnostic pop
-
std::unique_ptr<Dex2oatArgumentMap> Dex2oatArgumentMap::Parse(int argc,
const char** argv,
std::string* error_msg) {
@@ -264,4 +262,5 @@ std::unique_ptr<Dex2oatArgumentMap> Dex2oatArgumentMap::Parse(int argc,
return std::unique_ptr<Dex2oatArgumentMap>(new Dex2oatArgumentMap(parser.ReleaseArgumentsMap()));
}
+#pragma GCC diagnostic pop
} // namespace art