From 7d10404859abeb0f3aa15f4d845633ea12b70129 Mon Sep 17 00:00:00 2001 From: David Blaikie Date: Wed, 12 Aug 2015 22:58:10 +0000 Subject: -Wdeprecated: SavedInstanceContext is returned by value but isn't really copyable, but it can be made movable git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@244826 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Sema/SemaAccess.cpp | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'lib/Sema/SemaAccess.cpp') diff --git a/lib/Sema/SemaAccess.cpp b/lib/Sema/SemaAccess.cpp index 7c1755dbe7..e9772bc520 100644 --- a/lib/Sema/SemaAccess.cpp +++ b/lib/Sema/SemaAccess.cpp @@ -182,15 +182,20 @@ struct AccessTarget : public AccessedEntity { class SavedInstanceContext { public: + SavedInstanceContext(SavedInstanceContext &&S) + : Target(S.Target), Has(S.Has) { + S.Target = nullptr; + } ~SavedInstanceContext() { - Target.HasInstanceContext = Has; + if (Target) + Target->HasInstanceContext = Has; } private: friend struct AccessTarget; explicit SavedInstanceContext(AccessTarget &Target) - : Target(Target), Has(Target.HasInstanceContext) {} - AccessTarget &Target; + : Target(&Target), Has(Target.HasInstanceContext) {} + AccessTarget *Target; bool Has; }; -- cgit v1.2.1