From 6bac032d5694bacfeb9cf12be28ca5d0bae3de5e Mon Sep 17 00:00:00 2001 From: David Mott Date: Sun, 28 Apr 2019 21:26:20 -0500 Subject: [PATCH] break compile dependecy on ALARMManager.h --- utils/rowgroup/rowaggregation.cpp | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/utils/rowgroup/rowaggregation.cpp b/utils/rowgroup/rowaggregation.cpp index bae0e8e27..2a1dd862e 100644 --- a/utils/rowgroup/rowaggregation.cpp +++ b/utils/rowgroup/rowaggregation.cpp @@ -47,7 +47,7 @@ #include "funcexp.h" #include "rowaggregation.h" #include "calpontsystemcatalog.h" -#include "utils_utf8.h" +//#include "utils_utf8.h" //..comment out NDEBUG to enable assertions, uncomment NDEBUG to disable //#define NDEBUG @@ -57,6 +57,15 @@ using namespace std; using namespace boost; using namespace dataconvert; +namespace funcexp +{ + namespace utf8 + { + int idb_strcoll(const char*, const char*); + } +} + + // inlines of RowAggregation that used only in this file namespace { @@ -379,6 +388,7 @@ inline void RowAggregation::updateFloatMinMax(float val1, float val2, int64_t co } + #define STRCOLL_ENH__ void RowAggregation::updateStringMinMax(string val1, string val2, int64_t col, int func)