Re: [PATCH] D13054: [libc++] Un-guarded reference to uncaught_exception() in ostream header

[Asiri Rathnayake via cfe-commits]

rmaprath updated this revision to Diff 35367.
rmaprath added a comment.

Updated patch with bit more context (-U20).


http://reviews.llvm.org/D13054

Files:
  include/ostream

Index: include/ostream
===================================================================
--- include/ostream
+++ include/ostream
@@ -260,7 +260,10 @@
 basic_ostream<_CharT, _Traits>::sentry::~sentry()
 {
     if (__os_.rdbuf() && __os_.good() && (__os_.flags() & ios_base::unitbuf)
-                      && !uncaught_exception())
+#ifndef _LIBCPP_NO_EXCEPTIONS
+                      && !uncaught_exception()
+#endif  // _LIBCPP_NO_EXCEPTIONS
+       )
     {
 #ifndef _LIBCPP_NO_EXCEPTIONS
         try



Index: include/ostream
===================================================================
--- include/ostream
+++ include/ostream
@@ -260,7 +260,10 @@
 basic_ostream<_CharT, _Traits>::sentry::~sentry()
 {
     if (__os_.rdbuf() && __os_.good() && (__os_.flags() & ios_base::unitbuf)
-                      && !uncaught_exception())
+#ifndef _LIBCPP_NO_EXCEPTIONS
+                      && !uncaught_exception()
+#endif  // _LIBCPP_NO_EXCEPTIONS
+       )
     {
 #ifndef _LIBCPP_NO_EXCEPTIONS
         try

_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits