commit 6bb9f58bc8c71818464501c98533deb0e6f3ed19
author Howard Hinnant <hhinnant@apple.com> Fri May 28 13:35:41 2010 +0000
committer Howard Hinnant <hhinnant@apple.com> Fri May 28 13:35:41 2010 +0000
tree ae5817215006fd53d463cf33e1c24f110ae9ada8
parent 13c98cc20d7381aa14ce673cf94b593c141894ca

Corrected rethrow_if_nested

git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@104943 91177308-0d34-0410-b5e6-96231b3b80d8

include/exception

diff --git a/include/exception b/include/exception
index 600b548..51e8313 100644
--- a/include/exception
+++ b/include/exception
@@ -211,19 +211,19 @@
 inline
 void
 rethrow_if_nested(const _E& __e, typename enable_if<
-                                   !is_same<_E, nested_exception>::value &&
-                                   is_convertible<_E*, nested_exception*>::value
+                                   is_polymorphic<_E>::value
                                                    >::type* = 0)
 {
-    static_cast<const nested_exception&>(__e).rethrow_nested();
+    const nested_exception* __nep = dynamic_cast<const nested_exception*>(&__e);
+    if (__nep)
+        __nep->rethrow_nested();
 }
 
 template <class _E>
 inline
 void
 rethrow_if_nested(const _E& __e, typename enable_if<
-                                   is_same<_E, nested_exception>::value ||
-                                   !is_convertible<_E*, nested_exception*>::value
+                                   !is_polymorphic<_E>::value
                                                    >::type* = 0)
 {
 }