projects
/
platform
/
upstream
/
llvm.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b2c3eb8
)
Keep MSVC2015 happy after r316903
author
Krasimir Georgiev
<krasimir@google.com>
Mon, 30 Oct 2017 14:30:14 +0000
(14:30 +0000)
committer
Krasimir Georgiev
<krasimir@google.com>
Mon, 30 Oct 2017 14:30:14 +0000
(14:30 +0000)
llvm-svn: 316906
clang/lib/Format/Format.cpp
patch
|
blob
|
history
diff --git
a/clang/lib/Format/Format.cpp
b/clang/lib/Format/Format.cpp
index
ecc2bb7
..
0cd5398
100644
(file)
--- 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: