diff options
author | Dan Willemsen <dwillemsen@google.com> | 2017-11-29 18:06:11 -0800 |
---|---|---|
committer | Dan Willemsen <dwillemsen@google.com> | 2017-11-29 21:37:28 -0800 |
commit | 528f144e779dfd18b550d9176aecf36e1130f449 (patch) | |
tree | f8b8faf502550eabda14c99bcaffd4f3d25a205d /base | |
parent | 70fda27eb2a72958636c8026be7cc72881bdff25 (diff) | |
download | core-528f144e779dfd18b550d9176aecf36e1130f449.tar.gz core-528f144e779dfd18b550d9176aecf36e1130f449.tar.bz2 core-528f144e779dfd18b550d9176aecf36e1130f449.zip |
Fix / suppress new unused warnings for mingw+clang
Bug: 69933068
Test: mmma system/core
Change-Id: I089166a979d3d8c5ada38a7745d507b555048499
Diffstat (limited to 'base')
-rw-r--r-- | base/Android.bp | 1 | ||||
-rw-r--r-- | base/logging_test.cpp | 2 | ||||
-rw-r--r-- | base/utf8.cpp | 2 |
3 files changed, 4 insertions, 1 deletions
diff --git a/base/Android.bp b/base/Android.bp index 7ff02a0ee..ad0edf4a9 100644 --- a/base/Android.bp +++ b/base/Android.bp @@ -129,6 +129,7 @@ cc_test { }, windows: { srcs: ["utf8_test.cpp"], + cflags: ["-Wno-unused-parameter"], enabled: true, }, }, diff --git a/base/logging_test.cpp b/base/logging_test.cpp index adb041b32..6f05d9b7f 100644 --- a/base/logging_test.cpp +++ b/base/logging_test.cpp @@ -192,6 +192,7 @@ TEST(logging, WOULD_LOG_VERBOSE_enabled) { #undef CHECK_WOULD_LOG_ENABLED +#if !defined(_WIN32) static std::string make_log_pattern(android::base::LogSeverity severity, const char* message) { static const char log_characters[] = "VDIWEFF"; @@ -203,6 +204,7 @@ static std::string make_log_pattern(android::base::LogSeverity severity, "%c \\d+-\\d+ \\d+:\\d+:\\d+ \\s*\\d+ \\s*\\d+ %s:\\d+] %s", log_char, basename(&holder[0]), message); } +#endif static void CheckMessage(const CapturedStderr& cap, android::base::LogSeverity severity, const char* expected) { diff --git a/base/utf8.cpp b/base/utf8.cpp index 5984fb06c..adb46d09c 100644 --- a/base/utf8.cpp +++ b/base/utf8.cpp @@ -195,7 +195,7 @@ FILE* fopen(const char* name, const char* mode) { return _wfopen(name_utf16.c_str(), mode_utf16.c_str()); } -int mkdir(const char* name, mode_t mode) { +int mkdir(const char* name, mode_t) { std::wstring name_utf16; if (!UTF8PathToWindowsLongPath(name, &name_utf16)) { return -1; |