From a41521a8bd00298e72ed7a2469385c9432daca0f Mon Sep 17 00:00:00 2001 From: Hans Wennborg Date: Mon, 27 Oct 2014 22:28:50 +0000 Subject: [PATCH] Try to appease the C++ gods Looks like some builds were not happy with the potentially-throwing move constructor that was added in r220723, and reached for the implicitly deleted copy constructor instead. llvm-svn: 220725 --- clang/include/clang/Sema/Sema.h | 4 ++-- clang/include/clang/Sema/SemaInternal.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/clang/include/clang/Sema/Sema.h b/clang/include/clang/Sema/Sema.h index 3a3640c..549cf14 100644 --- a/clang/include/clang/Sema/Sema.h +++ b/clang/include/clang/Sema/Sema.h @@ -2603,8 +2603,8 @@ private: TypoDiagnosticGenerator DiagHandler; TypoRecoveryCallback RecoveryHandler; TypoExprState(); - TypoExprState(TypoExprState&& other); - TypoExprState& operator=(TypoExprState&& other); + TypoExprState(TypoExprState&& other) LLVM_NOEXCEPT; + TypoExprState& operator=(TypoExprState&& other) LLVM_NOEXCEPT; }; /// \brief The set of unhandled TypoExprs and their associated state. diff --git a/clang/include/clang/Sema/SemaInternal.h b/clang/include/clang/Sema/SemaInternal.h index e90f9f0..8c75264 100644 --- a/clang/include/clang/Sema/SemaInternal.h +++ b/clang/include/clang/Sema/SemaInternal.h @@ -267,12 +267,12 @@ private: inline Sema::TypoExprState::TypoExprState() {} -inline Sema::TypoExprState::TypoExprState(TypoExprState &&other) { +inline Sema::TypoExprState::TypoExprState(TypoExprState &&other) LLVM_NOEXCEPT { *this = std::move(other); } inline Sema::TypoExprState &Sema::TypoExprState::operator=( - Sema::TypoExprState &&other) { + Sema::TypoExprState &&other) LLVM_NOEXCEPT { Consumer = std::move(other.Consumer); DiagHandler = std::move(other.DiagHandler); RecoveryHandler = std::move(RecoveryHandler); -- 2.7.4