summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Gampe <agampe@google.com>2014-12-22 21:07:46 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2014-12-22 21:07:47 +0000
commit06814c9a6e40e8a1e211cd40ebf6431ce4a9721d (patch)
tree51129c490a15f55fe22106eb0a41999dbcf70d63
parent460bb2c6dad7ff9637f148177689598cc6f66486 (diff)
parentedb157fa272b58be8bb90fa4dc9cb7ca4c2760f2 (diff)
downloadandroid_art-06814c9a6e40e8a1e211cd40ebf6431ce4a9721d.tar.gz
android_art-06814c9a6e40e8a1e211cd40ebf6431ce4a9721d.tar.bz2
android_art-06814c9a6e40e8a1e211cd40ebf6431ce4a9721d.zip
Merge "ART: Mac build fix"
-rw-r--r--compiler/utils/swap_space.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/utils/swap_space.cc b/compiler/utils/swap_space.cc
index fc514354eb..325ee4fa01 100644
--- a/compiler/utils/swap_space.cc
+++ b/compiler/utils/swap_space.cc
@@ -153,9 +153,9 @@ SpaceChunk SwapSpace::NewFileChunk(size_t min_size) {
maps_.push_back(new_chunk);
return new_chunk;
#else
- UNUSED(kMininumMapSize);
+ UNUSED(min_size, kMininumMapSize);
LOG(FATAL) << "No swap file support on the Mac.";
- return {nullptr, 0U}; // NOLINT [readability/braces] [4]
+ UNREACHABLE();
#endif
}