diff options
| author | Sebastien Hertz <shertz@google.com> | 2015-04-03 07:49:44 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-04-03 07:49:46 +0000 |
| commit | ae36b4a8d05525c977af831f1b31126d84159e4f (patch) | |
| tree | 1b474b0bdec9db773cab0a2bca70dce1452f7cd1 /runtime/runtime.h | |
| parent | a68a7cf8f3a6fef22d71a14350176115cb13857f (diff) | |
| parent | 2fd7e69505195cda4caaa3161aaf37315552a698 (diff) | |
| download | android_art-ae36b4a8d05525c977af831f1b31126d84159e4f.tar.gz android_art-ae36b4a8d05525c977af831f1b31126d84159e4f.tar.bz2 android_art-ae36b4a8d05525c977af831f1b31126d84159e4f.zip | |
Merge "Use specific exception class to abort transaction"
Diffstat (limited to 'runtime/runtime.h')
| -rw-r--r-- | runtime/runtime.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/runtime/runtime.h b/runtime/runtime.h index 68458ae369..af6abbd6b6 100644 --- a/runtime/runtime.h +++ b/runtime/runtime.h @@ -469,9 +469,9 @@ class Runtime { void ExitTransactionMode(); bool IsTransactionAborted() const; - void AbortTransactionAndThrowInternalError(Thread* self, const std::string& abort_message) + void AbortTransactionAndThrowAbortError(Thread* self, const std::string& abort_message) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_); - void ThrowInternalErrorForAbortedTransaction(Thread* self) + void ThrowTransactionAbortError(Thread* self) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_); void RecordWriteFieldBoolean(mirror::Object* obj, MemberOffset field_offset, uint8_t value, |