aboutsummaryrefslogtreecommitdiff
path: root/contrib/llvm-project/libcxx/include/regex
diff options
context:
space:
mode:
authorDimitry Andric <dim@FreeBSD.org>2020-03-18 20:50:30 +0000
committerDimitry Andric <dim@FreeBSD.org>2020-03-18 20:50:30 +0000
commit9ec406dc40df40f5e40672437517d1f3fe78149b (patch)
treece7638d5ef85767726f546ad7d9dda59441fb7bf /contrib/llvm-project/libcxx/include/regex
parente39dad62a8554a48fed27bf81f5e43c0d42e727a (diff)
downloadsrc-9ec406dc40df40f5e40672437517d1f3fe78149b.tar.gz
src-9ec406dc40df40f5e40672437517d1f3fe78149b.zip
Merge commit 585a3cc31 from llvm git (by me):
Fix -Wdeprecated-copy-dtor and -Wdeprecated-dynamic-exception-spec warnings. Summary: The former are like: libcxx/include/typeinfo:322:11: warning: definition of implicit copy constructor for 'bad_cast' is deprecated because it has a user-declared destructor [-Wdeprecated-copy-dtor] virtual ~bad_cast() _NOEXCEPT; ^ libcxx/include/typeinfo:344:11: note: in implicit copy constructor for 'std::bad_cast' first required here throw bad_cast(); ^ Fix these by adding an explicitly defaulted copy constructor. The latter are like: libcxx/include/codecvt:105:37: warning: dynamic exception specifications are deprecated [-Wdeprecated-dynamic-exception-spec] virtual int do_encoding() const throw(); ^~~~~~~ Fix these by using the _NOEXCEPT macro instead. Reviewers: EricWF, mclow.lists, ldionne, #libc Reviewed By: EricWF, #libc Subscribers: dexonsmith, libcxx-commits Tags: #libc Differential Revision: https://reviews.llvm.org/D76150 This is because we use -Wsystem-headers during buildworld, and the two warnings above are now triggered by default with clang 10, preventing most C++ code from compiling without NO_WERROR. Requested by: brooks MFC after: 6 weeks X-MFC-With: 358851 Differential Revision: https://reviews.freebsd.org/D24049
Notes
Notes: svn path=/head/; revision=359087
Diffstat (limited to 'contrib/llvm-project/libcxx/include/regex')
-rw-r--r--contrib/llvm-project/libcxx/include/regex3
1 files changed, 2 insertions, 1 deletions
diff --git a/contrib/llvm-project/libcxx/include/regex b/contrib/llvm-project/libcxx/include/regex
index 5ac9e325e136..5145e74cef9a 100644
--- a/contrib/llvm-project/libcxx/include/regex
+++ b/contrib/llvm-project/libcxx/include/regex
@@ -977,7 +977,8 @@ class _LIBCPP_EXCEPTION_ABI regex_error
regex_constants::error_type __code_;
public:
explicit regex_error(regex_constants::error_type __ecode);
- virtual ~regex_error() throw();
+ regex_error(const regex_error&) _NOEXCEPT = default;
+ virtual ~regex_error() _NOEXCEPT;
_LIBCPP_INLINE_VISIBILITY
regex_constants::error_type code() const {return __code_;}
};