Author: rsmith
Date: Sun Jul 17 15:00:59 2016
New Revision: 275730
URL: http://llvm.org/viewvc/llvm-project?rev=275730&view=rev
Log:
Attempt to work around MSVC rejects-valid, round 2.
Modified:
cfe/trunk/lib/Frontend/ChainedIncludesSource.cpp
Modified: cfe/trunk/lib/Frontend/ChainedIncludesSource.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Frontend/ChainedIncludesSource.cpp?rev=275730&r1=275729&r2=275730&view=diff
==============================================================================
--- cfe/trunk/lib/Frontend/ChainedIncludesSource.cpp (original)
+++ cfe/trunk/lib/Frontend/ChainedIncludesSource.cpp Sun Jul 17 15:00:59 2016
@@ -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) {}
};
}
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
