From c032d7253953853cadae78f756afda16629b17e8 Mon Sep 17 00:00:00 2001 From: David Hall Date: Mon, 28 Sep 2020 12:48:50 -0500 Subject: [PATCH] MCOL-4327 dev Add std:: qualifier to distance() In Ubuntu 20.04, it appears that unqualified, distance() is found in both std:: and boost:: --- utils/windowfunction/windowfunction.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/utils/windowfunction/windowfunction.cpp b/utils/windowfunction/windowfunction.cpp index 31ef6ed07..1f7e92c36 100644 --- a/utils/windowfunction/windowfunction.cpp +++ b/utils/windowfunction/windowfunction.cpp @@ -25,7 +25,6 @@ using namespace std; #include -using namespace boost; #include "loggingid.h" #include "errorcodes.h" @@ -272,8 +271,8 @@ void WindowFunction::sort(std::vector::iterator v, uint64_t n) } } - sort(v, distance(v, h) + 1); - sort(l, distance(l, v) + n); + sort(v, std::distance(v, h) + 1); + sort(l, std::distance(l, v) + n); }