database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-08-01 06:46:55 +03:00
Code Activity

patch boost (sic!) to fix warning

Browse Source
This commit is contained in:
Leonid Fedorov
2025-04-14 20:41:56 +00:00
committed by Leonid Fedorov
parent 4a8f5830fd
commit 0dceaa318d
4 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cmake/boost.1.88.named_proxy.hpp.patch Normal file
View File

@ -0,0 +1,10 @@
+++ a/boost/interprocess/detail/named_proxy.hpp 2025-04-14 16:24:12.018395298 +0000
+++ b/boost/interprocess/detail/named_proxy.hpp 2025-04-14 16:24:12.018395298 +0000
@@ -89,6 +89,7 @@
} BOOST_INTERPROCESS_CATCH_END
}
+ virtual ~CtorArgN() {}
private:
template<std::size_t ...IdxPack>
void construct(void *mem, true_, const index_tuple<IdxPack...>&)

2
cmake/boost.cmake
View File

@ -43,6 +43,8 @@ ExternalProject_Add(
URL_HASH SHA256=3621533e820dcab1e8012afd583c0c73cf0f77694952b81352bf38c1488f9cb4 URL_HASH SHA256=3621533e820dcab1e8012afd583c0c73cf0f77694952b81352bf38c1488f9cb4
CONFIGURE_COMMAND ./bootstrap.sh CONFIGURE_COMMAND ./bootstrap.sh
UPDATE_COMMAND "" UPDATE_COMMAND ""
PATCH_COMMAND ${CMAKE_COMMAND} -E chdir <SOURCE_DIR> patch -p1 -i
${CMAKE_SOURCE_DIR}/storage/columnstore/columnstore/cmake/boost.1.88.named_proxy.hpp.patch
BUILD_COMMAND ./b2 -q ${_b2args} BUILD_COMMAND ./b2 -q ${_b2args}
BUILD_IN_SOURCE TRUE BUILD_IN_SOURCE TRUE
INSTALL_COMMAND ./b2 -q install ${_b2args} INSTALL_COMMAND ./b2 -q install ${_b2args}

3
cmake/compiler_flags.cmake
View File

@ -72,10 +72,11 @@ set(CLANG_FLAGS
-Wno-format-truncation -Wno-format-truncation
-Wno-register -Wno-register
-Wno-typedef-redefinition -Wno-typedef-redefinition
-Wno-missing-template-arg-list-after-template-kw
) )
set(GNU_FLAGS # suppressed warnings set(GNU_FLAGS # suppressed warnings
-Wno-deprecated-copy -Wno-deprecated-declarations -Wno-format-truncation -Wno-register -Wno-unused-variable -Wno-deprecated-copy -Wno-deprecated-declarations -Wno-format-truncation -Wno-register
) )
# } end compiler specific flags # } end compiler specific flags

9
primitives/primproc/primitiveserver.cpp
View File

@ -1555,14 +1555,9 @@ struct BPPHandler
bs >> stepID; bs >> stepID;
bs >> uniqueID; bs >> uniqueID;
boost::unique_lock<boost::shared_mutex> lk(getDJLock(uniqueID)); boost::shared_ptr<BPPV> bppv = nullptr;
boost::mutex::scoped_lock scoped(bppLock);
bppKeysIt = std::find(bppKeys.begin(), bppKeys.end(), uniqueID);
if (bppKeysIt != bppKeys.end())
{ {
boost::unique_lock<shared_mutex> lk(getDJLock(uniqueID)); boost::unique_lock<boost::shared_mutex> lk(getDJLock(uniqueID));
boost::mutex::scoped_lock scoped(bppLock); boost::mutex::scoped_lock scoped(bppLock);
bppKeysIt = std::find(bppKeys.begin(), bppKeys.end(), uniqueID); bppKeysIt = std::find(bppKeys.begin(), bppKeys.end(), uniqueID);