diff options
| author | David Chisnall <dchisnall@pathscale.com> | 2014-05-09 01:35:33 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-09 01:35:33 +0000 |
| commit | 101709a2940cbd9e1e42808e68ff9f8b417801a8 (patch) | |
| tree | f3bf8495c3842654f08c55cfdcef22ff270db198 | |
| parent | 50a4036f8968bc7798e5be2b90f9623257ebf155 (diff) | |
| parent | b2396b5945d7a2697c4762c3e52dc6f732b2eebd (diff) | |
| download | libcxxrt-101709a2940cbd9e1e42808e68ff9f8b417801a8.tar.gz | |
am b2396b59: Expose __cxa_current_exception_type in cxxabi.h. Required for Monotone.
* commit 'b2396b5945d7a2697c4762c3e52dc6f732b2eebd':
Expose __cxa_current_exception_type in cxxabi.h. Required for Monotone.
| -rw-r--r-- | src/cxxabi.h | 2 | ||||
| -rw-r--r-- | src/exception.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/cxxabi.h b/src/cxxabi.h index e1f5054..4b661b6 100644 --- a/src/cxxabi.h +++ b/src/cxxabi.h @@ -193,6 +193,8 @@ __cxa_eh_globals *__cxa_get_globals(void); */ __cxa_eh_globals *__cxa_get_globals_fast(void); +std::type_info * __cxa_current_exception_type(); + /** * Throws an exception returned by __cxa_current_primary_exception(). This * exception may have been caught in another thread. diff --git a/src/exception.cc b/src/exception.cc index 50ee582..343d69f 100644 --- a/src/exception.cc +++ b/src/exception.cc @@ -214,8 +214,6 @@ namespace std } -extern "C" std::type_info *__cxa_current_exception_type(); - /** * Class of exceptions to distinguish between this and other exception types. * |