aboutsummaryrefslogtreecommitdiff
path: root/system/lib/libcxxabi/src/cxa_exception.cpp
diff options
context:
space:
mode:
authorAlon Zakai <alonzakai@gmail.com>2013-04-01 12:55:33 -0700
committerAlon Zakai <alonzakai@gmail.com>2013-04-01 12:55:33 -0700
commit8408257cd66435af849f493c10c7f0e8d1d5fa3b (patch)
tree8b05963e8608b22f71620f512679d7cd5b1de548 /system/lib/libcxxabi/src/cxa_exception.cpp
parenta8e4801c7d38033fff760ea26a4579aa324e303e (diff)
parent36600f34ef0ec2cf75165be3753567e256f514db (diff)
Merge branch 'incoming'
Diffstat (limited to 'system/lib/libcxxabi/src/cxa_exception.cpp')
-rw-r--r--system/lib/libcxxabi/src/cxa_exception.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/system/lib/libcxxabi/src/cxa_exception.cpp b/system/lib/libcxxabi/src/cxa_exception.cpp
index 1c362993..f8c38c07 100644
--- a/system/lib/libcxxabi/src/cxa_exception.cpp
+++ b/system/lib/libcxxabi/src/cxa_exception.cpp
@@ -524,7 +524,7 @@ __cxa_decrement_exception_refcount(void* thrown_object) throw()
/*
Returns a pointer to the thrown object (if any) at the top of the
- caughtExceptions stack. Atommically increment the exception's referenceCount.
+ caughtExceptions stack. Atomically increment the exception's referenceCount.
If there is no such thrown object or if the thrown object is foreign,
returns null.
@@ -573,7 +573,7 @@ dependent_exception_cleanup(_Unwind_Reason_Code reason, _Unwind_Exception* unwin
}
/*
- If thrown_object is not null, allocate, initialize and thow a dependent
+ If thrown_object is not null, allocate, initialize and throw a dependent
exception.
*/
void