Skip to content

Fix build with Boost 1.86.0. #1247

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Fix build with Boost 1.86.0. #1247

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f27f5c4
Fix build with Boost 1.86.0.
BillyONeal Oct 18, 2024
ff8baad
Changed other locations where we used std::is_trivial to the more com…
ihsandemir Feb 12, 2025
b016d44
Merge branch 'master' into fix-boost-1-86
ihsandemir Feb 12, 2025
af0c931
Merge branch 'master' into fix-boost-1-86
ihsandemir Feb 19, 2025
2e905dc
Merge branch 'master' into fix-boost-1-86
JackPGreen Feb 19, 2025
4ef0995
Merge branch 'master' into fix-boost-1-86
JackPGreen Feb 20, 2025
6828b2d
Merge branch 'master' into fix-boost-1-86
JackPGreen Feb 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 17 additions & 13 deletions hazelcast/include/hazelcast/client/protocol/ClientMessage.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,11 @@
namespace hazelcast {
namespace util {
class ByteBuffer;

template<class T>
struct is_trivial_or_uuid : std::is_trivial<T> {};
template<>
struct is_trivial_or_uuid<boost::uuids::uuid> : std::true_type {};
}

namespace cp {
Expand Down Expand Up @@ -524,7 +529,7 @@ class HAZELCAST_API ClientMessage
template<typename T>
typename std::enable_if<
std::is_same<T, std::vector<typename T::value_type>>::value &&
!std::is_trivial<typename T::value_type>::value &&
!hazelcast::util::is_trivial_or_uuid<typename T::value_type>::value &&
!is_trivial_entry_vector<T>::value,
T>::type
get()
Expand Down Expand Up @@ -569,7 +574,7 @@ class HAZELCAST_API ClientMessage
template<typename T>
typename std::enable_if<
std::is_same<T, std::vector<typename T::value_type>>::value &&
std::is_trivial<typename T::value_type>::value,
hazelcast::util::is_trivial_or_uuid<typename T::value_type>::value,
T>::type
get()
{
Expand All @@ -594,8 +599,8 @@ class HAZELCAST_API ClientMessage
std::is_same<std::pair<typename T::value_type::first_type,
typename T::value_type::second_type>,
typename T::value_type>::value &&
std::is_trivial<typename T::value_type::first_type>::value &&
std::is_trivial<typename T::value_type::second_type>::value,
hazelcast::util::is_trivial_or_uuid<typename T::value_type::first_type>::value &&
hazelcast::util::is_trivial_or_uuid<typename T::value_type::second_type>::value,
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I didn't touch this one or the one after because as far as I could see nobody formed vector<pair<trivial, uuid>> but no objection to the change.

T>::type
get()
{
Expand Down Expand Up @@ -625,8 +630,8 @@ class HAZELCAST_API ClientMessage
std::is_same<std::pair<typename T::value_type::first_type,
typename T::value_type::second_type>,
typename T::value_type>::value &&
std::is_trivial<typename T::value_type::first_type>::value &&
!std::is_trivial<typename T::value_type::second_type>::value,
hazelcast::util::is_trivial_or_uuid<typename T::value_type::first_type>::value &&
!hazelcast::util::is_trivial_or_uuid<typename T::value_type::second_type>::value,
T>::type
get()
{
Expand Down Expand Up @@ -1246,12 +1251,11 @@ class HAZELCAST_API ClientMessage
set(nil);
if (!nil) {
boost::endian::endian_reverse_inplace<int64_t>(
*reinterpret_cast<int64_t*>(uuid.data));
*reinterpret_cast<int64_t*>(&uuid.data[0]));
boost::endian::endian_reverse_inplace<int64_t>(
*reinterpret_cast<int64_t*>(uuid.data +
util::Bits::LONG_SIZE_IN_BYTES));
*reinterpret_cast<int64_t*>(&uuid.data[util::Bits::LONG_SIZE_IN_BYTES]));
std::memcpy(wr_ptr(sizeof(boost::uuids::uuid)),
uuid.data,
&uuid.data[0],
sizeof(boost::uuids::uuid));
} else {
wr_ptr(sizeof(boost::uuids::uuid));
Expand Down Expand Up @@ -1525,13 +1529,13 @@ class HAZELCAST_API ClientMessage
boost::uuids::uuid get_uuid()
{
boost::uuids::uuid u;
memcpy(&u.data,
memcpy(&u.data[0],
rd_ptr(sizeof(boost::uuids::uuid)),
sizeof(boost::uuids::uuid));
boost::endian::endian_reverse_inplace<int64_t>(
*reinterpret_cast<int64_t*>(u.data));
*reinterpret_cast<int64_t*>(&u.data[0]));
boost::endian::endian_reverse_inplace<int64_t>(
*reinterpret_cast<int64_t*>(u.data + util::Bits::LONG_SIZE_IN_BYTES));
*reinterpret_cast<int64_t*>(&u.data[util::Bits::LONG_SIZE_IN_BYTES]));
return u;
}

Expand Down
4 changes: 2 additions & 2 deletions hazelcast/include/hazelcast/client/proxy/SerializingProxy.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,7 @@ class HAZELCAST_API SerializingProxy
}

template<typename T>
typename std::enable_if<std::is_trivial<T>::value, boost::future<T>>::
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think the changes in this file have any effect because nobody tried to use this decode function with a boost::uuid. No objection to the change though.

typename std::enable_if<hazelcast::util::is_trivial_or_uuid<T>::value, boost::future<T>>::
type static decode(boost::future<protocol::ClientMessage> f)
{
return f.then(boost::launch::sync,
Expand All @@ -384,7 +384,7 @@ class HAZELCAST_API SerializingProxy
}

template<typename T>
typename std::enable_if<!std::is_trivial<T>::value, boost::future<T>>::
typename std::enable_if<!hazelcast::util::is_trivial_or_uuid<T>::value, boost::future<T>>::
type static decode(boost::future<protocol::ClientMessage> f)
{
return f.then(boost::launch::sync,
Expand Down
4 changes: 2 additions & 2 deletions hazelcast/include/hazelcast/client/serialization/pimpl/data_input.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,11 +182,11 @@ class data_input
{
check_available(util::Bits::UUID_SIZE_IN_BYTES);
boost::uuids::uuid u;
std::memcpy(&u.data, &buffer_[pos_], util::Bits::UUID_SIZE_IN_BYTES);
std::memcpy(&u.data[0], &buffer_[pos_], util::Bits::UUID_SIZE_IN_BYTES);
pos_ += util::Bits::UUID_SIZE_IN_BYTES;
if (byte_order_ == boost::endian::order::little) {
boost::endian::endian_reverse_inplace<int64_t>(
*reinterpret_cast<int64_t*>(u.data));
*reinterpret_cast<int64_t*>(&u.data[0]));
boost::endian::endian_reverse_inplace<int64_t>(
*reinterpret_cast<int64_t*>(
&u.data[util::Bits::LONG_SIZE_IN_BYTES]));
Expand Down
17 changes: 1 addition & 16 deletions hazelcast/include/hazelcast/client/spi/impl/ClientInvocation.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,22 +210,7 @@ class HAZELCAST_API ClientInvocation
const std::string& name,
int partition = UNASSIGNED_PARTITION,
const std::shared_ptr<connection::Connection>& conn = nullptr,
boost::uuids::uuid uuid = { 0x0,
0x0,
0x0,
0x0,
0x0,
0x0,
0x0,
0x0,
0x0,
0x0,
0x0,
0x0,
0x0,
0x0,
0x0,
0x0 });
boost::uuids::uuid uuid = {});

void invoke_on_selection();

Expand Down
2 changes: 1 addition & 1 deletion hazelcast/src/hazelcast/client/protocol.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,7 +376,7 @@ operator<<(std::ostream& os, const ClientMessage& msg)
void
ClientMessage::set(unsigned char* /* memory */, boost::uuids::uuid uuid)
{
std::memcpy(wr_ptr(uuid.size()), uuid.data, uuid.size());
std::memcpy(wr_ptr(uuid.size()), &uuid.data[0], uuid.size());
}

void
Expand Down
4 changes: 2 additions & 2 deletions hazelcast/src/hazelcast/client/serialization.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -731,12 +731,12 @@ data_output::write(boost::uuids::uuid v)
}
if (byte_order_ == boost::endian::order::little) {
boost::endian::endian_reverse_inplace<int64_t>(
*reinterpret_cast<int64_t*>(v.data));
*reinterpret_cast<int64_t*>(&v.data[0]));
boost::endian::endian_reverse_inplace<int64_t>(
*reinterpret_cast<int64_t*>(&v.data[util::Bits::LONG_SIZE_IN_BYTES]));
}
output_stream_.insert(
output_stream_.end(), v.data, v.data + util::Bits::UUID_SIZE_IN_BYTES);
output_stream_.end(), &v.data[0], &v.data[util::Bits::LONG_SIZE_IN_BYTES]);
}

template<>
Expand Down
Loading