From 85c8822dd1ca60d82c7b82f5caf177303c1d84eb Mon Sep 17 00:00:00 2001 From: Justin Viiret Date: Wed, 16 Aug 2017 13:05:24 +1000 Subject: [PATCH] fdr_compile: simplify lambda use This was failing to compile on MSVC. --- src/fdr/fdr_compile.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/fdr/fdr_compile.cpp b/src/fdr/fdr_compile.cpp index e50245d7..5e3c6a4e 100644 --- a/src/fdr/fdr_compile.cpp +++ b/src/fdr/fdr_compile.cpp @@ -644,11 +644,12 @@ bool isSuffix(const hwlmLiteral &lit1, const hwlmLiteral &lit2) { size_t len2 = s2.length(); assert(len1 >= len2); - auto lit_cmp = (lit1.nocase || lit2.nocase) - ? [](char a, char b) { return mytoupper(a) == mytoupper(b); } - : [](char a, char b) { return a == b; }; - - return equal(s2.begin(), s2.end(), s1.begin() + len1 - len2, lit_cmp); + if (lit1.nocase || lit2.nocase) { + return equal(s2.begin(), s2.end(), s1.begin() + len1 - len2, + [](char a, char b) { return mytoupper(a) == mytoupper(b); }); + } else { + return equal(s2.begin(), s2.end(), s1.begin() + len1 - len2); + } } /*