Skip to content

Commit 2197375

Browse files
BillyONealBillyONeal
committed
Fix build with Boost 1.86.0.
1 parent 4a027a8 commit 2197375

File tree

5 files changed

+64
-28
lines changed

5 files changed

+64
-28
lines changed

‎hazelcast/include/hazelcast/client/protocol/ClientMessage.h

Lines changed: 58 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -619,6 +619,36 @@ class HAZELCAST_API ClientMessage
619619
return result;
620620
}
621621

622+
template<typename T>
623+
typename std::enable_if<
624+
std::is_same<T, std::vector<typename T::value_type>>::value &&
625+
std::is_same<std::pair<boost::uuids::uuid,
626+
typename T::value_type::second_type>,
627+
typename T::value_type>::value &&
628+
std::is_trivial<typename T::value_type::second_type>::value,
629+
T>::type
630+
get()
631+
{
632+
T result;
633+
634+
auto f = reinterpret_cast<frame_header_type*>(
635+
rd_ptr(SIZE_OF_FRAME_LENGTH_AND_FLAGS));
636+
auto content_length =
637+
static_cast<int32_t>(f->frame_len) - SIZE_OF_FRAME_LENGTH_AND_FLAGS;
638+
size_t item_count =
639+
content_length /
640+
(ClientMessage::get_sizeof<boost::uuids::uuid>() +
641+
ClientMessage::get_sizeof<typename T::value_type::second_type>());
642+
for (size_t i = 0; i < item_count; ++i) {
643+
auto key = get<boost::uuids::uuid>();
644+
auto value = get<typename T::value_type::second_type>();
645+
result.emplace_back(
646+
std::make_pair(std::move(key), std::move(value)));
647+
}
648+
649+
return result;
650+
}
651+
622652
template<typename T>
623653
typename std::enable_if<
624654
std::is_same<T, std::vector<typename T::value_type>>::value &&
@@ -642,6 +672,28 @@ class HAZELCAST_API ClientMessage
642672
return result;
643673
}
644674

675+
template<typename T>
676+
typename std::enable_if<
677+
std::is_same<T, std::vector<typename T::value_type>>::value &&
678+
std::is_same<std::pair<boost::uuids::uuid,
679+
typename T::value_type::second_type>,
680+
typename T::value_type>::value &&
681+
!std::is_trivial<typename T::value_type::second_type>::value,
682+
T>::type
683+
get()
684+
{
685+
T result;
686+
687+
auto values = get<std::vector<typename T::value_type::second_type>>();
688+
auto keys = get<std::vector<boost::uuids::uuid>>();
689+
690+
for (size_t i = 0; i < keys.size(); ++i) {
691+
result.emplace_back(std::make_pair(keys[i], std::move(values[i])));
692+
}
693+
694+
return result;
695+
}
696+
645697
template<typename T>
646698
typename std::enable_if<
647699
std::is_same<T,
@@ -1246,12 +1298,11 @@ class HAZELCAST_API ClientMessage
12461298
set(nil);
12471299
if (!nil) {
12481300
boost::endian::endian_reverse_inplace<int64_t>(
1249-
*reinterpret_cast<int64_t*>(uuid.data));
1301+
*reinterpret_cast<int64_t*>(&uuid.data[0]));
12501302
boost::endian::endian_reverse_inplace<int64_t>(
1251-
*reinterpret_cast<int64_t*>(uuid.data +
1252-
util::Bits::LONG_SIZE_IN_BYTES));
1303+
*reinterpret_cast<int64_t*>(&uuid.data[util::Bits::LONG_SIZE_IN_BYTES]));
12531304
std::memcpy(wr_ptr(sizeof(boost::uuids::uuid)),
1254-
uuid.data,
1305+
&uuid.data[0],
12551306
sizeof(boost::uuids::uuid));
12561307
} else {
12571308
wr_ptr(sizeof(boost::uuids::uuid));
@@ -1525,13 +1576,13 @@ class HAZELCAST_API ClientMessage
15251576
boost::uuids::uuid get_uuid()
15261577
{
15271578
boost::uuids::uuid u;
1528-
memcpy(&u.data,
1579+
memcpy(&u.data[0],
15291580
rd_ptr(sizeof(boost::uuids::uuid)),
15301581
sizeof(boost::uuids::uuid));
15311582
boost::endian::endian_reverse_inplace<int64_t>(
1532-
*reinterpret_cast<int64_t*>(u.data));
1583+
*reinterpret_cast<int64_t*>(&u.data[0]));
15331584
boost::endian::endian_reverse_inplace<int64_t>(
1534-
*reinterpret_cast<int64_t*>(u.data + util::Bits::LONG_SIZE_IN_BYTES));
1585+
*reinterpret_cast<int64_t*>(&u.data[util::Bits::LONG_SIZE_IN_BYTES]));
15351586
return u;
15361587
}
15371588

‎hazelcast/include/hazelcast/client/serialization/pimpl/data_input.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -182,11 +182,11 @@ class data_input
182182
{
183183
check_available(util::Bits::UUID_SIZE_IN_BYTES);
184184
boost::uuids::uuid u;
185-
std::memcpy(&u.data, &buffer_[pos_], util::Bits::UUID_SIZE_IN_BYTES);
185+
std::memcpy(&u.data[0], &buffer_[pos_], util::Bits::UUID_SIZE_IN_BYTES);
186186
pos_ += util::Bits::UUID_SIZE_IN_BYTES;
187187
if (byte_order_ == boost::endian::order::little) {
188188
boost::endian::endian_reverse_inplace<int64_t>(
189-
*reinterpret_cast<int64_t*>(u.data));
189+
*reinterpret_cast<int64_t*>(&u.data[0]));
190190
boost::endian::endian_reverse_inplace<int64_t>(
191191
*reinterpret_cast<int64_t*>(
192192
&u.data[util::Bits::LONG_SIZE_IN_BYTES]));

‎hazelcast/include/hazelcast/client/spi/impl/ClientInvocation.h

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -210,22 +210,7 @@ class HAZELCAST_API ClientInvocation
210210
const std::string& name,
211211
int partition = UNASSIGNED_PARTITION,
212212
const std::shared_ptr<connection::Connection>& conn = nullptr,
213-
boost::uuids::uuid uuid = { 0x0,
214-
0x0,
215-
0x0,
216-
0x0,
217-
0x0,
218-
0x0,
219-
0x0,
220-
0x0,
221-
0x0,
222-
0x0,
223-
0x0,
224-
0x0,
225-
0x0,
226-
0x0,
227-
0x0,
228-
0x0 });
213+
boost::uuids::uuid uuid = {});
229214

230215
void invoke_on_selection();
231216

‎hazelcast/src/hazelcast/client/protocol.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -376,7 +376,7 @@ operator<<(std::ostream& os, const ClientMessage& msg)
376376
void
377377
ClientMessage::set(unsigned char* /* memory */, boost::uuids::uuid uuid)
378378
{
379-
std::memcpy(wr_ptr(uuid.size()), uuid.data, uuid.size());
379+
std::memcpy(wr_ptr(uuid.size()), &uuid.data[0], uuid.size());
380380
}
381381

382382
void

‎hazelcast/src/hazelcast/client/serialization.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -731,12 +731,12 @@ data_output::write(boost::uuids::uuid v)
731731
}
732732
if (byte_order_ == boost::endian::order::little) {
733733
boost::endian::endian_reverse_inplace<int64_t>(
734-
*reinterpret_cast<int64_t*>(v.data));
734+
*reinterpret_cast<int64_t*>(&v.data[0]));
735735
boost::endian::endian_reverse_inplace<int64_t>(
736736
*reinterpret_cast<int64_t*>(&v.data[util::Bits::LONG_SIZE_IN_BYTES]));
737737
}
738738
output_stream_.insert(
739-
output_stream_.end(), v.data, v.data + util::Bits::UUID_SIZE_IN_BYTES);
739+
output_stream_.end(), &v.data[0], &v.data[util::Bits::LONG_SIZE_IN_BYTES]);
740740
}
741741

742742
template<>

0 commit comments

Comments
 (0)