From 5eb7e1bf18cd8c488d43f88b836a7d913d10cb3b Mon Sep 17 00:00:00 2001
From: Richard Smith <richard-llvm@metafoo.co.uk>
Date: Sun, 17 Jul 2016 20:00:59 +0000
Subject: Attempt to work around MSVC rejects-valid, round 2.

llvm-svn: 275730
---
 clang/lib/Frontend/ChainedIncludesSource.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'clang/lib/Frontend')

diff --git a/clang/lib/Frontend/ChainedIncludesSource.cpp b/clang/lib/Frontend/ChainedIncludesSource.cpp
index 708e262de6b..3f126615b1e 100644
--- a/clang/lib/Frontend/ChainedIncludesSource.cpp
+++ b/clang/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) {}
 };
 }
-- 
cgit v1.2.3