From d4cf894edc61220ca785227a373634dc7668cb13 Mon Sep 17 00:00:00 2001 From: "david.hall" Date: Tue, 14 Jun 2022 14:32:01 -0500 Subject: [PATCH] MCOL-4841 fix some compiler issues --- dbcon/execplan/calpontsystemcatalog.h | 1 + primitives/primproc/batchprimitiveprocessor.h | 2 -- utils/messageqcpp/bytestream.h | 1 + utils/threadpool/prioritythreadpool.h | 1 + utils/threadpool/threadpool.h | 1 + utils/threadpool/weightedthreadpool.h | 1 + 6 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dbcon/execplan/calpontsystemcatalog.h b/dbcon/execplan/calpontsystemcatalog.h index 055d4846c..8abce1c4d 100644 --- a/dbcon/execplan/calpontsystemcatalog.h +++ b/dbcon/execplan/calpontsystemcatalog.h @@ -24,6 +24,7 @@ /** @file */ #pragma once +#define BOOST_BIND_GLOBAL_PLACEHOLDERS #include #include diff --git a/primitives/primproc/batchprimitiveprocessor.h b/primitives/primproc/batchprimitiveprocessor.h index fc4fcda5b..70ab4c837 100644 --- a/primitives/primproc/batchprimitiveprocessor.h +++ b/primitives/primproc/batchprimitiveprocessor.h @@ -443,8 +443,6 @@ class BatchPrimitiveProcessor static const uint64_t maxResultCount = 1048576; // 2^20 - static const uint64_t maxResultCount = 1048576; // 2^20 - friend class Command; friend class ColumnCommand; friend class DictStep; diff --git a/utils/messageqcpp/bytestream.h b/utils/messageqcpp/bytestream.h index 672e9112f..79512884a 100644 --- a/utils/messageqcpp/bytestream.h +++ b/utils/messageqcpp/bytestream.h @@ -19,6 +19,7 @@ */ #pragma once +#define BOOST_BIND_GLOBAL_PLACEHOLDERS #include #include diff --git a/utils/threadpool/prioritythreadpool.h b/utils/threadpool/prioritythreadpool.h index fbd479966..7ba2b8a96 100644 --- a/utils/threadpool/prioritythreadpool.h +++ b/utils/threadpool/prioritythreadpool.h @@ -23,6 +23,7 @@ /** @file */ #pragma once +#define BOOST_BIND_GLOBAL_PLACEHOLDERS #include #include diff --git a/utils/threadpool/threadpool.h b/utils/threadpool/threadpool.h index adf9ee030..09990a9b3 100644 --- a/utils/threadpool/threadpool.h +++ b/utils/threadpool/threadpool.h @@ -28,6 +28,7 @@ /** @file */ #pragma once +#define BOOST_BIND_GLOBAL_PLACEHOLDERS #include #include diff --git a/utils/threadpool/weightedthreadpool.h b/utils/threadpool/weightedthreadpool.h index ae8e0b026..7e895cad2 100644 --- a/utils/threadpool/weightedthreadpool.h +++ b/utils/threadpool/weightedthreadpool.h @@ -23,6 +23,7 @@ /** @file */ #pragma once +#define BOOST_BIND_GLOBAL_PLACEHOLDERS #include #include