Author: hhinnant
Date: Wed Feb 29 09:37:30 2012
New Revision: 151727
URL: http://llvm.org/viewvc/llvm-project?rev=151727&view=rev
Log:
I'm reverting one of the changes made to exception.cpp in r151717. I'm unsure
what the change was trying to do, but it didn't do the right thing for
__APPLE__. So instead of trying to guess what was intended, I'm just putting
it back the way it was.
Modified:
libcxx/trunk/src/exception.cpp
Modified: libcxx/trunk/src/exception.cpp
URL:
http://llvm.org/viewvc/llvm-project/libcxx/trunk/src/exception.cpp?rev=151727&r1=151726&r2=151727&view=diff
==============================================================================
--- libcxx/trunk/src/exception.cpp (original)
+++ libcxx/trunk/src/exception.cpp Wed Feb 29 09:37:30 2012
@@ -99,6 +99,10 @@
#if __APPLE__
// on Darwin, there is a helper function so __cxa_get_globals is private
return __cxa_uncaught_exception();
+#elif LIBCXXRT
+ __cxa_eh_globals * globals = __cxa_get_globals();
+ return (globals->uncaughtExceptions != 0);
+#else // __APPLE__
#warning uncaught_exception not yet implemented
::abort();
#endif // __APPLE__
_______________________________________________
cfe-commits mailing list
[email protected]
http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
