commit e56e9a4fef89658f53beeb32e23adc4fc80aca6c
author Krasimir Georgiev <krasimir@google.com> Mon Oct 30 14:30:14 2017 +0000
committer Krasimir Georgiev <krasimir@google.com> Mon Oct 30 14:30:14 2017 +0000
tree b115abad044f38f61d7836413a83d5fee12218fa
parent b2c3eb8cf18fd749eb6f71314a7f657dcbfb4b84

Keep MSVC2015 happy after r316903

llvm-svn: 316906

clang/lib/Format/Format.cpp

diff --git a/clang/lib/Format/Format.cpp b/clang/lib/Format/Format.cpp
index ecc2bb7..0cd5398 100644
--- a/clang/lib/Format/Format.cpp
+++ b/clang/lib/Format/Format.cpp
@@ -1027,8 +1027,8 @@
                     /*LastStartColumn=*/Env.getLastStartColumn());
     for (const auto &R : Whitespaces.generateReplacements())
       if (Result.add(R))
-        return {Result, 0};
-    return {Result, Penalty};
+        return std::make_pair(Result, 0);
+    return std::make_pair(Result, Penalty);
   }
 
 private: