diff options
author | Ian Rogers <irogers@google.com> | 2014-10-10 11:02:11 -0700 |
---|---|---|
committer | Ian Rogers <irogers@google.com> | 2014-10-10 12:26:02 -0700 |
commit | 647b1a86f518d8db0331b3d52a96392b7a62504b (patch) | |
tree | 7370f795ef3c7fbdd2695d23bc6f8171f40f43f1 /dex2oat | |
parent | acfbbd4df2fc1c79a7102587bebf398f95b5e5de (diff) | |
download | android_art-647b1a86f518d8db0331b3d52a96392b7a62504b.tar.gz android_art-647b1a86f518d8db0331b3d52a96392b7a62504b.tar.bz2 android_art-647b1a86f518d8db0331b3d52a96392b7a62504b.zip |
Fix 2 new sets of clang compiler warnings.
Fix issues that are flagged by -Wfloat-equal and -Wmissing-noreturn.
In the case of -Wfloat-equal the current cases in regular code are deliberate,
so the change is to silence the warning. For gtest code the appropriate fix is
to switch from EXPECT_EQ to EXPECT_(FLOAT|DOUBLE)_EQ.
The -Wmissing-noreturn warning isn't enabled due to a missing noreturn in
gtest. This issue has been reported to gtest.
Change-Id: Id84c70c21c542716c9ee0c41492e8ff8788c4ef8
Diffstat (limited to 'dex2oat')
-rw-r--r-- | dex2oat/dex2oat.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/dex2oat/dex2oat.cc b/dex2oat/dex2oat.cc index e1f513d046..d782aeb108 100644 --- a/dex2oat/dex2oat.cc +++ b/dex2oat/dex2oat.cc @@ -90,6 +90,7 @@ static void UsageError(const char* fmt, ...) { va_end(ap); } +static void Usage(const char* fmt, ...) NO_RETURN; static void Usage(const char* fmt, ...) { va_list ap; va_start(ap, fmt); @@ -662,7 +663,7 @@ class WatchDog { Message('W', message); } - static void Fatal(const std::string& message) { + static void Fatal(const std::string& message) NO_RETURN { Message('F', message); exit(1); } |