summaryrefslogtreecommitdiffstats
path: root/clang/lib/Format
diff options
context:
space:
mode:
authorKrasimir Georgiev <krasimir@google.com>2017-10-30 14:30:14 +0000
committerKrasimir Georgiev <krasimir@google.com>2017-10-30 14:30:14 +0000
commite56e9a4fef89658f53beeb32e23adc4fc80aca6c (patch)
treeb115abad044f38f61d7836413a83d5fee12218fa /clang/lib/Format
parentb2c3eb8cf18fd749eb6f71314a7f657dcbfb4b84 (diff)
downloadbcm5719-llvm-e56e9a4fef89658f53beeb32e23adc4fc80aca6c.tar.gz
bcm5719-llvm-e56e9a4fef89658f53beeb32e23adc4fc80aca6c.zip
Keep MSVC2015 happy after r316903
llvm-svn: 316906
Diffstat (limited to 'clang/lib/Format')
-rw-r--r--clang/lib/Format/Format.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/clang/lib/Format/Format.cpp b/clang/lib/Format/Format.cpp
index ecc2bb7b843..0cd5398751b 100644
--- a/clang/lib/Format/Format.cpp
+++ b/clang/lib/Format/Format.cpp
@@ -1027,8 +1027,8 @@ public:
/*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:
OpenPOWER on IntegriCloud