diff options
author | Richard Smith <richard-llvm@metafoo.co.uk> | 2016-07-17 20:00:59 +0000 |
---|---|---|
committer | Richard Smith <richard-llvm@metafoo.co.uk> | 2016-07-17 20:00:59 +0000 |
commit | b982b0f61ba0147eb3d502a524bffa288f4e6428 (patch) | |
tree | 1296f522d3a54a201cd52147c0aef9b298927c5a /lib/Frontend/ChainedIncludesSource.cpp | |
parent | 63fb39eeeda536661f57ba26802d1e56f599489c (diff) |
Attempt to work around MSVC rejects-valid, round 2.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@275730 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Frontend/ChainedIncludesSource.cpp')
-rw-r--r-- | lib/Frontend/ChainedIncludesSource.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/Frontend/ChainedIncludesSource.cpp b/lib/Frontend/ChainedIncludesSource.cpp index 708e262de6..3f126615b1 100644 --- a/lib/Frontend/ChainedIncludesSource.cpp +++ b/lib/Frontend/ChainedIncludesSource.cpp @@ -54,6 +54,10 @@ private: /// Members of ChainedIncludesSource, factored out so we can initialize /// them before we initialize the ExternalSemaSource base class. struct ChainedIncludesSourceMembers { + ChainedIncludesSourceMembers( + std::vector<std::unique_ptr<CompilerInstance>> CIs, + IntrusiveRefCntPtr<ExternalSemaSource> FinalReader) + : Impl(std::move(CIs)), FinalReader(std::move(FinalReader)) {} ChainedIncludesSourceImpl Impl; IntrusiveRefCntPtr<ExternalSemaSource> FinalReader; }; @@ -66,8 +70,7 @@ class ChainedIncludesSource public: ChainedIncludesSource(std::vector<std::unique_ptr<CompilerInstance>> CIs, IntrusiveRefCntPtr<ExternalSemaSource> FinalReader) - : ChainedIncludesSourceMembers(ChainedIncludesSourceMembers{ - {std::move(CIs)}, std::move(FinalReader)}), + : ChainedIncludesSourceMembers(std::move(CIs), std::move(FinalReader)), MultiplexExternalSemaSource(Impl, *this->FinalReader) {} }; } |