From 4fa2255f7f7156a1165d8fbe9d35ed22aae296cc Mon Sep 17 00:00:00 2001 From: Raghuveer Devulapalli Date: Fri, 20 Oct 2023 13:43:10 -0700 Subject: [PATCH] Fix rebase merge bugs --- src/avx512-64bit-argsort.hpp | 2 +- src/avx512-64bit-keyvaluesort.hpp | 2 +- src/avx512-64bit-qsort.hpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/avx512-64bit-argsort.hpp b/src/avx512-64bit-argsort.hpp index 2d2c33f5..f706ded7 100644 --- a/src/avx512-64bit-argsort.hpp +++ b/src/avx512-64bit-argsort.hpp @@ -7,7 +7,7 @@ #ifndef AVX512_ARGSORT_64BIT #define AVX512_ARGSORT_64BIT -#include "avx512-common-qsort.h" +#include "xss-common-qsort.h" #include "avx512-64bit-common.h" #include "xss-network-keyvaluesort.hpp" #include diff --git a/src/avx512-64bit-keyvaluesort.hpp b/src/avx512-64bit-keyvaluesort.hpp index c24e575a..b1ec0cd2 100644 --- a/src/avx512-64bit-keyvaluesort.hpp +++ b/src/avx512-64bit-keyvaluesort.hpp @@ -8,7 +8,7 @@ #ifndef AVX512_QSORT_64BIT_KV #define AVX512_QSORT_64BIT_KV -#include "avx512-common-qsort.h" +#include "xss-common-qsort.h" #include "avx512-64bit-common.h" #include "xss-network-keyvaluesort.hpp" diff --git a/src/avx512-64bit-qsort.hpp b/src/avx512-64bit-qsort.hpp index afafe250..4dcaeafa 100644 --- a/src/avx512-64bit-qsort.hpp +++ b/src/avx512-64bit-qsort.hpp @@ -7,7 +7,7 @@ #ifndef AVX512_QSORT_64BIT #define AVX512_QSORT_64BIT -#include "avx512-common-qsort.h" +#include "xss-common-qsort.h" #include "avx512-64bit-common.h" #endif // AVX512_QSORT_64BIT