summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Hiroshi Yamauchi <yamauchi@google.com> 2014-05-02 21:22:11 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2014-05-02 21:22:11 +0000
commitdbb8727b0b3ae73e84fb8db55e051336d6222add (patch)
tree65fef715ced80320fe77db7dd3cccedfb4f3ce0c
parent2220cb17d2879c6296313bb671c6ee1813b93b55 (diff)
parent52cf5c09ab706f8bbd2a2cf2fb1ef1041f020314 (diff)
Merge "Add inline to RosAlloc::AllocFromCurrentRunUnlocked()."
-rw-r--r--runtime/gc/allocator/rosalloc.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/gc/allocator/rosalloc.cc b/runtime/gc/allocator/rosalloc.cc
index f11303002c..a693659595 100644
--- a/runtime/gc/allocator/rosalloc.cc
+++ b/runtime/gc/allocator/rosalloc.cc
@@ -584,7 +584,7 @@ RosAlloc::Run* RosAlloc::RefillRun(Thread* self, size_t idx) {
return AllocRun(self, idx);
}
-void* RosAlloc::AllocFromCurrentRunUnlocked(Thread* self, size_t idx) {
+inline void* RosAlloc::AllocFromCurrentRunUnlocked(Thread* self, size_t idx) {
Run* current_run = current_runs_[idx];
DCHECK(current_run != nullptr);
void* slot_addr = current_run->AllocSlot();