Barto22 commented on code in PR #18096:
URL: https://github.com/apache/nuttx/pull/18096#discussion_r2718182431
##########
libs/libxx/libcxx/0001-libcxx-fix-ld-errors.patch:
##########
@@ -1,28 +1,27 @@
-diff --git libcxx/include/ostream libcxx/include/ostream
---- libcxx/include/ostream
-+++ libcxx/include/ostream
-@@ -320,7 +320,10 @@ template <class _CharT, class _Traits>
- basic_ostream<_CharT, _Traits>::sentry::~sentry()
- {
- if (__os_.rdbuf() && __os_.good() && (__os_.flags() & ios_base::unitbuf)
-- && !uncaught_exception())
+--- libcxx/include/__ostream/basic_ostream.h
++++ libcxx/include/__ostream/basic_ostream.h
+@@ -152,7 +152,11 @@
+
+ template <class _CharT, class _Traits>
+ basic_ostream<_CharT, _Traits>::sentry::~sentry() {
+- if (__os_.rdbuf() && __os_.good() && (__os_.flags() & ios_base::unitbuf) &&
!uncaught_exception()) {
++ if (__os_.rdbuf() && __os_.good() && (__os_.flags() & ios_base::unitbuf)
+#ifndef _LIBCPP_HAS_NO_EXCEPTIONS
-+ && !uncaught_exception()
++ && !uncaught_exception()
+#endif
-+ )
- {
++ ) {
#ifndef _LIBCPP_HAS_NO_EXCEPTIONS
- try
-diff --git libcxx/src/exception.cpp libcxx/src/exception.cpp
+ try {
+ #endif // _LIBCPP_HAS_NO_EXCEPTIONS
--- libcxx/src/exception.cpp
+++ libcxx/src/exception.cpp
@@ -19,6 +19,9 @@
#if defined(_LIBCPP_ABI_MICROSOFT)
- #include "support/runtime/exception_msvc.ipp"
- #include "support/runtime/exception_pointer_msvc.ipp"
+ # include "support/runtime/exception_msvc.ipp"
Review Comment:
Done
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
