From 862a3a8aa61d7fcdae4f996ef112b5a16dea00be Mon Sep 17 00:00:00 2001 From: Zachary Turner Date: Wed, 15 Mar 2017 22:32:59 +0000 Subject: [PATCH] Try to fix build break due to template argument deduction. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@297902 91177308-0d34-0410-b5e6-96231b3b80d8 --- tools/llvm-pdbdump/Diff.cpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/tools/llvm-pdbdump/Diff.cpp b/tools/llvm-pdbdump/Diff.cpp index 6ad235a8839..2b020ef9f74 100644 --- a/tools/llvm-pdbdump/Diff.cpp +++ b/tools/llvm-pdbdump/Diff.cpp @@ -54,11 +54,12 @@ static void set_differences(Range &&R1, Range &&R2, } } -template -static void set_differences(Range &&R1, Range &&R2, - SmallVectorImpl> *OnlyLeft, - SmallVectorImpl> *OnlyRight, - SmallVectorImpl> *Intersection) { +template +static void +set_differences(Range &&R1, Range &&R2, + SmallVectorImpl> *OnlyLeft, + SmallVectorImpl> *OnlyRight, + SmallVectorImpl> *Intersection = nullptr) { std::less> Comp; set_differences(std::forward(R1), std::forward(R2), OnlyLeft, OnlyRight, Intersection, Comp); } @@ -338,7 +339,7 @@ Error DiffStyle::diffStringTable() { SmallVector OnlyP; SmallVector OnlyQ; - set_differences(Strings1, Strings2, &OnlyP, &OnlyQ, nullptr); + set_differences(Strings1, Strings2, &OnlyP, &OnlyQ); if (!OnlyP.empty()) { HasDiff = true; -- 2.50.1