]> git.ipfire.org Git - thirdparty/vectorscan.git/commitdiff
Use std::distance explicitly to avoid ambiguity with boost
authorWang, Xiang W <xiang.w.wang@intel.com>
Wed, 26 Sep 2018 10:52:40 +0000 (06:52 -0400)
committerChang, Harry <harry.chang@intel.com>
Fri, 11 Jan 2019 08:05:55 +0000 (16:05 +0800)
src/nfa/limex_compile.cpp

index 6053b56f875f1bde5a953b64c431336c92413911..bbb266051b5c7b1b0c5d63072a6fcab12bb75b6c 100644 (file)
@@ -980,7 +980,7 @@ u32 addSquashMask(const build_info &args, const NFAVertex &v,
     // see if we've already seen it, otherwise add a new one.
     auto it = find(squash.begin(), squash.end(), sit->second);
     if (it != squash.end()) {
-        return verify_u32(distance(squash.begin(), it));
+        return verify_u32(std::distance(squash.begin(), it));
     }
     u32 idx = verify_u32(squash.size());
     squash.push_back(sit->second);
@@ -1007,7 +1007,7 @@ u32 addReports(const flat_set<ReportID> &r, vector<ReportID> &reports,
     auto it = search(begin(reports), end(reports), begin(my_reports),
                      end(my_reports));
     if (it != end(reports)) {
-        u32 offset = verify_u32(distance(begin(reports), it));
+        u32 offset = verify_u32(std::distance(begin(reports), it));
         DEBUG_PRINTF("reusing found report list at %u\n", offset);
         return offset;
     }