From: Justin Viiret <justin.viiret@intel.com>
Date: Wed, 16 Aug 2017 03:05:24 +0000 (+1000)
Subject: fdr_compile: simplify lambda use
X-Git-Tag: v4.6.0^2~21
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=85c8822dd1ca60d82c7b82f5caf177303c1d84eb;p=thirdparty%2Fvectorscan.git

fdr_compile: simplify lambda use

This was failing to compile on MSVC.
---

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);
+    }
 }
 
 /*