mirror of
https://github.com/apache/nuttx.git
synced 2025-01-13 09:49:21 +08:00
db31e56957
Since there are some patches that need to be loaded manually, the original method is rather confusing. Now these patches that need to be loaded manually are classified into various cxx library folders, and each dynamically downloaded cxx library is moved down one directory to make the directory structure clearer. Signed-off-by: wangmingrong1 <wangmingrong1@xiaomi.com>
28 lines
1.1 KiB
Diff
28 lines
1.1 KiB
Diff
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())
|
|
+#ifndef _LIBCPP_HAS_NO_EXCEPTIONS
|
|
+ && !uncaught_exception()
|
|
+#endif
|
|
+ )
|
|
{
|
|
#ifndef _LIBCPP_HAS_NO_EXCEPTIONS
|
|
try
|
|
diff --git libcxx/src/exception.cpp libcxx/src/exception.cpp
|
|
--- 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"
|
|
+#elif defined(_LIBCPPABI_VERSION) && defined(_LIBCPP_HAS_NO_EXCEPTIONS)
|
|
+#include "include/atomic_support.h"
|
|
+#include "support/runtime/exception_pointer_unimplemented.ipp"
|
|
#elif defined(_LIBCPPABI_VERSION)
|
|
#include "support/runtime/exception_libcxxabi.ipp"
|
|
#include "support/runtime/exception_pointer_cxxabi.ipp"
|