From a508b86091ab5fc65fc3f090caecf993fff14429 Mon Sep 17 00:00:00 2001 From: Leonid Fedorov Date: Fri, 14 Apr 2023 09:42:50 +0000 Subject: [PATCH] remove boost/shared_array include --- dbcon/joblist/crossenginestep.cpp | 2 +- dbcon/joblist/elementtype.h | 2 +- dbcon/joblist/expressionstep.cpp | 2 +- dbcon/joblist/groupconcat.cpp | 2 +- dbcon/joblist/groupconcat.h | 2 +- dbcon/joblist/jobstep.h | 2 +- dbcon/joblist/jsonarrayagg.cpp | 2 +- dbcon/joblist/jsonarrayagg.h | 2 +- dbcon/joblist/limitedorderby.cpp | 2 +- dbcon/joblist/primitivestep.h | 2 +- dbcon/joblist/subquerystep.cpp | 2 +- dbcon/joblist/subquerystep.h | 2 +- dbcon/joblist/threadsafequeue.h | 2 +- dbcon/joblist/tupleaggregatestep.cpp | 2 +- dbcon/joblist/tupleannexstep.cpp | 2 +- dbcon/joblist/tupleconstantstep.cpp | 2 +- dbcon/joblist/tuplehavingstep.cpp | 2 +- dbcon/joblist/windowfunctionstep.cpp | 2 +- dmlproc/batchinsertprocessor.h | 2 +- primitives/linux-port/primitiveprocessor.h | 2 +- storage-manager/src/CloudStorage.h | 2 +- storage-manager/src/IOCoordinator.h | 2 +- storage-manager/src/Replicator.cpp | 2 +- utils/common/fixedallocator.h | 2 +- utils/common/poolallocator.h | 2 +- utils/joiner/tuplejoiner.h | 2 +- utils/messageqcpp/bytestream.h | 2 +- utils/messageqcpp/inetstreamsocket.cpp | 2 +- utils/rowgroup/rowaggregation.h | 2 +- utils/rowgroup/rowgroup.cpp | 2 +- utils/rowgroup/rowgroup.h | 2 +- utils/windowfunction/idborderby.cpp | 2 +- utils/windowfunction/idborderby.h | 2 +- versioning/BRM/dbrm.h | 2 +- versioning/BRM/sessionmanagerserver.h | 2 +- 35 files changed, 35 insertions(+), 35 deletions(-) diff --git a/dbcon/joblist/crossenginestep.cpp b/dbcon/joblist/crossenginestep.cpp index 9732655d1..6527a7ffd 100644 --- a/dbcon/joblist/crossenginestep.cpp +++ b/dbcon/joblist/crossenginestep.cpp @@ -27,7 +27,7 @@ using namespace std; #include -#include + #include using namespace boost; diff --git a/dbcon/joblist/elementtype.h b/dbcon/joblist/elementtype.h index 944a85ad2..4711d17e2 100644 --- a/dbcon/joblist/elementtype.h +++ b/dbcon/joblist/elementtype.h @@ -26,7 +26,7 @@ #include #include #include -#include + #include #include diff --git a/dbcon/joblist/expressionstep.cpp b/dbcon/joblist/expressionstep.cpp index b182c7b21..14d217d0b 100644 --- a/dbcon/joblist/expressionstep.cpp +++ b/dbcon/joblist/expressionstep.cpp @@ -24,7 +24,7 @@ using namespace std; #include -#include + using namespace boost; #include "messagequeue.h" diff --git a/dbcon/joblist/groupconcat.cpp b/dbcon/joblist/groupconcat.cpp index 050a36d3f..28c1bcf8a 100644 --- a/dbcon/joblist/groupconcat.cpp +++ b/dbcon/joblist/groupconcat.cpp @@ -24,7 +24,7 @@ #include using namespace std; -#include + using namespace boost; #include "errorids.h" diff --git a/dbcon/joblist/groupconcat.h b/dbcon/joblist/groupconcat.h index dce8306dc..250520313 100644 --- a/dbcon/joblist/groupconcat.h +++ b/dbcon/joblist/groupconcat.h @@ -25,7 +25,7 @@ #include #include #include -#include + #include "returnedcolumn.h" // SRCP #include "rowgroup.h" // RowGroup diff --git a/dbcon/joblist/jobstep.h b/dbcon/joblist/jobstep.h index 28bd4f994..362950f4c 100644 --- a/dbcon/joblist/jobstep.h +++ b/dbcon/joblist/jobstep.h @@ -29,7 +29,7 @@ #include #include -#include + #include #include "calpontsystemcatalog.h" diff --git a/dbcon/joblist/jsonarrayagg.cpp b/dbcon/joblist/jsonarrayagg.cpp index 57374e969..94df90cf7 100644 --- a/dbcon/joblist/jsonarrayagg.cpp +++ b/dbcon/joblist/jsonarrayagg.cpp @@ -21,7 +21,7 @@ #include using namespace std; -#include + using namespace boost; #include "errorids.h" diff --git a/dbcon/joblist/jsonarrayagg.h b/dbcon/joblist/jsonarrayagg.h index d3fefb972..db3b918d0 100644 --- a/dbcon/joblist/jsonarrayagg.h +++ b/dbcon/joblist/jsonarrayagg.h @@ -23,7 +23,7 @@ #include #include #include -#include + #include "groupconcat.h" diff --git a/dbcon/joblist/limitedorderby.cpp b/dbcon/joblist/limitedorderby.cpp index f4e573bd7..f2bd3f111 100644 --- a/dbcon/joblist/limitedorderby.cpp +++ b/dbcon/joblist/limitedorderby.cpp @@ -23,7 +23,7 @@ #include using namespace std; -#include + using namespace boost; #include "errorids.h" diff --git a/dbcon/joblist/primitivestep.h b/dbcon/joblist/primitivestep.h index 6f2d1a9b1..06acf56e5 100644 --- a/dbcon/joblist/primitivestep.h +++ b/dbcon/joblist/primitivestep.h @@ -36,7 +36,7 @@ #include #include -#include + #include #include diff --git a/dbcon/joblist/subquerystep.cpp b/dbcon/joblist/subquerystep.cpp index fbc46912e..f437fd181 100644 --- a/dbcon/joblist/subquerystep.cpp +++ b/dbcon/joblist/subquerystep.cpp @@ -24,7 +24,7 @@ using namespace std; #include -#include + #include #include #include diff --git a/dbcon/joblist/subquerystep.h b/dbcon/joblist/subquerystep.h index 3c587d170..eec2e4d5f 100644 --- a/dbcon/joblist/subquerystep.h +++ b/dbcon/joblist/subquerystep.h @@ -23,7 +23,7 @@ #include #include -#include + #include #include "jobstep.h" diff --git a/dbcon/joblist/threadsafequeue.h b/dbcon/joblist/threadsafequeue.h index 7a45b0690..36958ba14 100644 --- a/dbcon/joblist/threadsafequeue.h +++ b/dbcon/joblist/threadsafequeue.h @@ -27,7 +27,7 @@ #include #include #include -#include + namespace joblist diff --git a/dbcon/joblist/tupleaggregatestep.cpp b/dbcon/joblist/tupleaggregatestep.cpp index 71ee28676..5928167e5 100644 --- a/dbcon/joblist/tupleaggregatestep.cpp +++ b/dbcon/joblist/tupleaggregatestep.cpp @@ -30,7 +30,7 @@ using namespace std; #include -#include + #include #include #include "boost/tuple/tuple.hpp" diff --git a/dbcon/joblist/tupleannexstep.cpp b/dbcon/joblist/tupleannexstep.cpp index c4aeff34e..a62bac653 100644 --- a/dbcon/joblist/tupleannexstep.cpp +++ b/dbcon/joblist/tupleannexstep.cpp @@ -26,7 +26,7 @@ using namespace std; #include -#include + #include using namespace boost; diff --git a/dbcon/joblist/tupleconstantstep.cpp b/dbcon/joblist/tupleconstantstep.cpp index 8c176d112..ce540ed0e 100644 --- a/dbcon/joblist/tupleconstantstep.cpp +++ b/dbcon/joblist/tupleconstantstep.cpp @@ -25,7 +25,7 @@ using namespace std; #include -#include + #include using namespace boost; diff --git a/dbcon/joblist/tuplehavingstep.cpp b/dbcon/joblist/tuplehavingstep.cpp index 60496895a..b9e9d5962 100644 --- a/dbcon/joblist/tuplehavingstep.cpp +++ b/dbcon/joblist/tuplehavingstep.cpp @@ -24,7 +24,7 @@ using namespace std; #include -#include + #include using namespace boost; diff --git a/dbcon/joblist/windowfunctionstep.cpp b/dbcon/joblist/windowfunctionstep.cpp index 0e6c57991..87ccf47ad 100644 --- a/dbcon/joblist/windowfunctionstep.cpp +++ b/dbcon/joblist/windowfunctionstep.cpp @@ -26,7 +26,7 @@ using namespace std; #include // to_upper_copy #include -#include + #include #include using namespace boost; diff --git a/dmlproc/batchinsertprocessor.h b/dmlproc/batchinsertprocessor.h index 725581d20..a8d9ef82c 100644 --- a/dmlproc/batchinsertprocessor.h +++ b/dmlproc/batchinsertprocessor.h @@ -25,7 +25,7 @@ #include #include #include -#include + #include #include #include diff --git a/primitives/linux-port/primitiveprocessor.h b/primitives/linux-port/primitiveprocessor.h index 6e22c23db..faa81ab6f 100644 --- a/primitives/linux-port/primitiveprocessor.h +++ b/primitives/linux-port/primitiveprocessor.h @@ -38,7 +38,7 @@ #endif #include #include -#include + #include "primitivemsg.h" #include "calpontsystemcatalog.h" diff --git a/storage-manager/src/CloudStorage.h b/storage-manager/src/CloudStorage.h index ff4ea304b..9f9ef30b6 100644 --- a/storage-manager/src/CloudStorage.h +++ b/storage-manager/src/CloudStorage.h @@ -18,7 +18,7 @@ #pragma once #include -#include + #include "SMLogging.h" namespace storagemanager diff --git a/storage-manager/src/IOCoordinator.h b/storage-manager/src/IOCoordinator.h index 601c2ee6e..2c6e30c37 100644 --- a/storage-manager/src/IOCoordinator.h +++ b/storage-manager/src/IOCoordinator.h @@ -24,7 +24,7 @@ #include #include #include -#include + #include #include "Config.h" diff --git a/storage-manager/src/Replicator.cpp b/storage-manager/src/Replicator.cpp index 10fc07002..a225fc3e5 100644 --- a/storage-manager/src/Replicator.cpp +++ b/storage-manager/src/Replicator.cpp @@ -29,7 +29,7 @@ #include #define BOOST_SPIRIT_THREADSAFE #include -#include + #include #include diff --git a/utils/common/fixedallocator.h b/utils/common/fixedallocator.h index b24f8ce98..8fb6271af 100644 --- a/utils/common/fixedallocator.h +++ b/utils/common/fixedallocator.h @@ -33,7 +33,7 @@ #pragma once #include -#include + #include #include #include diff --git a/utils/common/poolallocator.h b/utils/common/poolallocator.h index 19d90c7b2..cd3eb03d4 100644 --- a/utils/common/poolallocator.h +++ b/utils/common/poolallocator.h @@ -29,7 +29,7 @@ #include #include #include -#include + #include namespace utils diff --git a/utils/joiner/tuplejoiner.h b/utils/joiner/tuplejoiner.h index dd05fe277..80d4fd381 100644 --- a/utils/joiner/tuplejoiner.h +++ b/utils/joiner/tuplejoiner.h @@ -22,7 +22,7 @@ #include #include #include -#include + #include #include diff --git a/utils/messageqcpp/bytestream.h b/utils/messageqcpp/bytestream.h index fd5c32f5b..9548e3c87 100644 --- a/utils/messageqcpp/bytestream.h +++ b/utils/messageqcpp/bytestream.h @@ -26,7 +26,7 @@ #include #include #include -#include + #include #include #include diff --git a/utils/messageqcpp/inetstreamsocket.cpp b/utils/messageqcpp/inetstreamsocket.cpp index 61ec082d1..d9f0bd9aa 100644 --- a/utils/messageqcpp/inetstreamsocket.cpp +++ b/utils/messageqcpp/inetstreamsocket.cpp @@ -73,7 +73,7 @@ using namespace std; #include using boost::scoped_array; -#include + #define INETSTREAMSOCKET_DLLEXPORT #include "inetstreamsocket.h" diff --git a/utils/rowgroup/rowaggregation.h b/utils/rowgroup/rowaggregation.h index 5e537e0cb..a81c0ce4c 100644 --- a/utils/rowgroup/rowaggregation.h +++ b/utils/rowgroup/rowaggregation.h @@ -35,7 +35,7 @@ #include #include #include -#include + #include #include diff --git a/utils/rowgroup/rowgroup.cpp b/utils/rowgroup/rowgroup.cpp index a316faa54..1ff41c213 100644 --- a/utils/rowgroup/rowgroup.cpp +++ b/utils/rowgroup/rowgroup.cpp @@ -31,7 +31,7 @@ #include using namespace std; -#include + #include using namespace boost; diff --git a/utils/rowgroup/rowgroup.h b/utils/rowgroup/rowgroup.h index 059390309..7a69877df 100644 --- a/utils/rowgroup/rowgroup.h +++ b/utils/rowgroup/rowgroup.h @@ -33,7 +33,7 @@ // #define NDEBUG #include #include -#include + #include #include #include diff --git a/utils/windowfunction/idborderby.cpp b/utils/windowfunction/idborderby.cpp index 3156a4e69..ec4008062 100644 --- a/utils/windowfunction/idborderby.cpp +++ b/utils/windowfunction/idborderby.cpp @@ -28,7 +28,7 @@ using namespace std; #include "calpontselectexecutionplan.h" #include "rowgroup.h" -#include + using namespace boost; #include "errorids.h" diff --git a/utils/windowfunction/idborderby.h b/utils/windowfunction/idborderby.h index dee63bd03..3ea9f892f 100644 --- a/utils/windowfunction/idborderby.h +++ b/utils/windowfunction/idborderby.h @@ -26,7 +26,7 @@ #include #include #include -#include + #include #include diff --git a/versioning/BRM/dbrm.h b/versioning/BRM/dbrm.h index b7fe43278..38393c400 100644 --- a/versioning/BRM/dbrm.h +++ b/versioning/BRM/dbrm.h @@ -32,7 +32,7 @@ #include #include #include -#include + #include #include "brmtypes.h" diff --git a/versioning/BRM/sessionmanagerserver.h b/versioning/BRM/sessionmanagerserver.h index 3c068127f..320ce8ee7 100644 --- a/versioning/BRM/sessionmanagerserver.h +++ b/versioning/BRM/sessionmanagerserver.h @@ -28,7 +28,7 @@ #include -#include + #include #include