summaryrefslogtreecommitdiffstats
path: root/runtime/runtime.cc
diff options
context:
space:
mode:
authorNarayan Kamath <narayan@google.com>2014-04-03 12:28:17 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2014-04-03 12:28:17 +0000
commit0c7350d774e42c1ec889e40ffe70beb5b6c27afb (patch)
treea5709a76694529392846c68cb34bd9c8503e85f3 /runtime/runtime.cc
parent5cc2d076cb7854ec2327895e5586f4cbe5e3ee70 (diff)
parent3de95a7b0a2d30cde6dc92b72c35df3a61002124 (diff)
downloadart-0c7350d774e42c1ec889e40ffe70beb5b6c27afb.zip
art-0c7350d774e42c1ec889e40ffe70beb5b6c27afb.tar.gz
art-0c7350d774e42c1ec889e40ffe70beb5b6c27afb.tar.bz2
Merge "Runtime::PreZygoteFork returns void, not boolean."
Diffstat (limited to 'runtime/runtime.cc')
-rw-r--r--runtime/runtime.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/runtime/runtime.cc b/runtime/runtime.cc
index 1b3c996..f8634ce 100644
--- a/runtime/runtime.cc
+++ b/runtime/runtime.cc
@@ -272,9 +272,8 @@ void Runtime::Abort() {
// notreached
}
-bool Runtime::PreZygoteFork() {
+void Runtime::PreZygoteFork() {
heap_->PreZygoteFork();
- return true;
}
void Runtime::CallExitHook(jint status) {