diff --git a/.github/workflows/reusable-windows-ci.yml b/.github/workflows/reusable-windows-ci.yml index 8fe11bad05f..236a6c73c8c 100644 --- a/.github/workflows/reusable-windows-ci.yml +++ b/.github/workflows/reusable-windows-ci.yml @@ -144,6 +144,8 @@ jobs: - name: Install OpenSSL uses: eProsima/eprosima-CI/windows/install_openssl@v0 + with: + version: '3.1.1' - name: Update OpenSSL environment variables run: | diff --git a/include/fastdds/rtps/messages/CDRMessage.hpp b/include/fastdds/rtps/messages/CDRMessage.hpp index 855fa1a368c..d74f28bf8d0 100644 --- a/include/fastdds/rtps/messages/CDRMessage.hpp +++ b/include/fastdds/rtps/messages/CDRMessage.hpp @@ -269,7 +269,7 @@ inline SequenceNumberSet_t CDRMessage::readSequenceNumberSet( valid &= (seqNum.high >= 0); if (valid && std::numeric_limits::max() == seqNum.high) { - numBits = (std::min)(numBits, std::numeric_limits::max() - seqNum.low); + numBits = (std::min)(numBits, (std::numeric_limits::max)() - seqNum.low); } uint32_t n_longs = (numBits + 31u) / 32u; diff --git a/include/fastdds/rtps/security/logging/Logging.h b/include/fastdds/rtps/security/logging/Logging.h index 9d520ae17f8..340d5bf9a43 100644 --- a/include/fastdds/rtps/security/logging/Logging.h +++ b/include/fastdds/rtps/security/logging/Logging.h @@ -188,7 +188,7 @@ class Logging LogOptions log_options_; GUID_t guid_; std::string guid_str_; - uint32_t domain_id_ = std::numeric_limits::max(); + uint32_t domain_id_ = (std::numeric_limits::max)(); std::string domain_id_str_; }; diff --git a/include/fastrtps/utils/fixed_size_bitmap.hpp b/include/fastrtps/utils/fixed_size_bitmap.hpp index 40bbd627b47..abd4d5ed1d7 100644 --- a/include/fastrtps/utils/fixed_size_bitmap.hpp +++ b/include/fastrtps/utils/fixed_size_bitmap.hpp @@ -324,7 +324,7 @@ class BitmapRange const T& from, const T& to) { - constexpr uint32_t full_mask = std::numeric_limits::max(); + constexpr uint32_t full_mask = (std::numeric_limits::max)(); // Adapt incoming range to range limits T min = (base_ >= from) ? base_ : from; @@ -431,7 +431,7 @@ class BitmapRange short shift = num_bits & 31u; if (0 < num_bits && shift != 0) { - bitmap_[num_items - 1] &= ~(std::numeric_limits::max() >> shift); + bitmap_[num_items - 1] &= ~((std::numeric_limits::max)() >> shift); } calc_maximum_bit_set(num_items, 0); } diff --git a/src/cpp/fastdds/subscriber/history/DataReaderInstance.hpp b/src/cpp/fastdds/subscriber/history/DataReaderInstance.hpp index da2721c681b..690af13f283 100644 --- a/src/cpp/fastdds/subscriber/history/DataReaderInstance.hpp +++ b/src/cpp/fastdds/subscriber/history/DataReaderInstance.hpp @@ -47,7 +47,7 @@ struct DataReaderInstance //! The list of alive writers for this instance WriterCollection alive_writers; //! GUID and strength of the current maximum strength writer - WriterOwnership current_owner{ {}, std::numeric_limits::max() }; + WriterOwnership current_owner{ {}, (std::numeric_limits::max)() }; //! The time when the group will miss the deadline std::chrono::steady_clock::time_point next_deadline_us; //! Current view state of the instance @@ -195,10 +195,10 @@ struct DataReaderInstance current_owner.first = writer_guid; ret_val = true; } - else if (std::numeric_limits::max() == ownership_strength) // uint32_t::max indicates we are in SHARED_OWNERSHIP_QOS. + else if ((std::numeric_limits::max)() == ownership_strength) // uint32_t::max indicates we are in SHARED_OWNERSHIP_QOS. { assert(eprosima::fastrtps::rtps::c_Guid_Unknown == current_owner.first); - assert(std::numeric_limits::max() == current_owner.second); + assert((std::numeric_limits::max)() == current_owner.second); ret_val = true; } else if (eprosima::fastrtps::rtps::c_Guid_Unknown == current_owner.first) // Without owner. @@ -247,7 +247,7 @@ struct DataReaderInstance writer_guid < current_owner.first) ) { - if (std::numeric_limits::max() != ownership_strength) // Not SHARED_OWNERSHIP_QOS + if ((std::numeric_limits::max)() != ownership_strength) // Not SHARED_OWNERSHIP_QOS { current_owner.first = writer_guid; current_owner.second = ownership_strength; diff --git a/src/cpp/rtps/DataSharing/WriterPool.hpp b/src/cpp/rtps/DataSharing/WriterPool.hpp index 09c10240c73..270d09c2c9e 100644 --- a/src/cpp/rtps/DataSharing/WriterPool.hpp +++ b/src/cpp/rtps/DataSharing/WriterPool.hpp @@ -182,7 +182,8 @@ class WriterPool : public DataSharingPayloadPool { EPROSIMA_LOG_ERROR(DATASHARING_PAYLOADPOOL, "Failed to create segment " << segment_name_ << ": Segment size is too large: " << estimated_size_for_payloads_pool - << " (max is " << std::numeric_limits::max() << ")." + << " (max is " << + (std::numeric_limits::max)() << ")." << " Please reduce the maximum size of the history"); return false; } diff --git a/src/cpp/rtps/builtin/liveliness/WLP.cpp b/src/cpp/rtps/builtin/liveliness/WLP.cpp index 9824f6d704f..811eab184d3 100644 --- a/src/cpp/rtps/builtin/liveliness/WLP.cpp +++ b/src/cpp/rtps/builtin/liveliness/WLP.cpp @@ -52,7 +52,7 @@ static void set_builtin_reader_history_attributes( const ResourceLimitedContainerConfig& allocation, bool is_secure) { - constexpr uint32_t c_upper_limit = std::numeric_limits::max() / 2u; + constexpr uint32_t c_upper_limit = (std::numeric_limits::max)() / 2u; hatt.payloadMaxSize = is_secure ? 128 : 28; diff --git a/src/cpp/rtps/flowcontrol/FlowControllerImpl.hpp b/src/cpp/rtps/flowcontrol/FlowControllerImpl.hpp index 1060bd941aa..004686dcd00 100644 --- a/src/cpp/rtps/flowcontrol/FlowControllerImpl.hpp +++ b/src/cpp/rtps/flowcontrol/FlowControllerImpl.hpp @@ -933,7 +933,7 @@ class FlowControllerImpl : public FlowController { uint32_t limitation = get_max_payload(); - if (std::numeric_limits::max() != limitation) + if ((std::numeric_limits::max)() != limitation) { sched.set_bandwith_limitation(limitation); } @@ -1457,7 +1457,7 @@ class FlowControllerImpl : public FlowController typename std::enable_if::value, uint32_t>::type constexpr get_max_payload_impl() const { - return std::numeric_limits::max(); + return (std::numeric_limits::max)(); } fastrtps::TimedMutex mutex_; diff --git a/src/cpp/rtps/history/CacheChangePool.cpp b/src/cpp/rtps/history/CacheChangePool.cpp index edd0e42521f..7b67a078c62 100644 --- a/src/cpp/rtps/history/CacheChangePool.cpp +++ b/src/cpp/rtps/history/CacheChangePool.cpp @@ -67,7 +67,7 @@ void CacheChangePool::init( } else { - max_pool_size_ = std::numeric_limits::max(); + max_pool_size_ = (std::numeric_limits::max)(); } switch (memory_mode_) diff --git a/src/cpp/rtps/history/TopicPayloadPool.cpp b/src/cpp/rtps/history/TopicPayloadPool.cpp index 5c75c652bad..dbb42d5e949 100644 --- a/src/cpp/rtps/history/TopicPayloadPool.cpp +++ b/src/cpp/rtps/history/TopicPayloadPool.cpp @@ -212,7 +212,7 @@ void TopicPayloadPool::update_maximum_size( { if (config.maximum_size == 0) { - max_pool_size_ = std::numeric_limits::max(); + max_pool_size_ = (std::numeric_limits::max)(); ++infinite_histories_count_; } else diff --git a/src/cpp/rtps/network/NetworkFactory.cpp b/src/cpp/rtps/network/NetworkFactory.cpp index 24f7c37eb79..2208827a1ea 100644 --- a/src/cpp/rtps/network/NetworkFactory.cpp +++ b/src/cpp/rtps/network/NetworkFactory.cpp @@ -36,8 +36,8 @@ using SendResourceList = fastdds::rtps::SendResourceList; NetworkFactory::NetworkFactory( const RTPSParticipantAttributes& PParam) - : maxMessageSizeBetweenTransports_(std::numeric_limits::max()) - , minSendBufferSize_(std::numeric_limits::max()) + : maxMessageSizeBetweenTransports_((std::numeric_limits::max)()) + , minSendBufferSize_((std::numeric_limits::max)()) , network_configuration_(0) { const std::string* enforce_metatraffic = nullptr; @@ -121,7 +121,7 @@ bool NetworkFactory::RegisterTransport( { bool wasRegistered = false; - uint32_t minSendBufferSize = std::numeric_limits::max(); + uint32_t minSendBufferSize = (std::numeric_limits::max)(); std::unique_ptr transport(descriptor->create_transport()); diff --git a/src/cpp/rtps/participant/RTPSParticipantImpl.cpp b/src/cpp/rtps/participant/RTPSParticipantImpl.cpp index 4d5ab5d69bc..69e1c37dfc0 100644 --- a/src/cpp/rtps/participant/RTPSParticipantImpl.cpp +++ b/src/cpp/rtps/participant/RTPSParticipantImpl.cpp @@ -1695,9 +1695,9 @@ bool RTPSParticipantImpl::createReceiverResources( // An auxilary buffer is needed in the ReceiverResource to to decrypt the message, // that imposes a limit in the received messages size even if the transport allows (uint32_t) messages size. uint32_t max_receiver_buffer_size = - is_secure() ? std::numeric_limits::max() : std::numeric_limits::max(); + is_secure() ? std::numeric_limits::max() : (std::numeric_limits::max)(); #else - uint32_t max_receiver_buffer_size = std::numeric_limits::max(); + uint32_t max_receiver_buffer_size = (std::numeric_limits::max)(); #endif // if HAVE_SECURITY for (auto it_loc = Locator_list.begin(); it_loc != Locator_list.end(); ++it_loc) @@ -2076,9 +2076,9 @@ uint32_t RTPSParticipantImpl::getMaxMessageSize() const // that imposes a limit in the received messages size even if the transport allows (uint32_t) messages size. // So the sender limits also its size. uint32_t max_receiver_buffer_size = - is_secure() ? std::numeric_limits::max() : std::numeric_limits::max(); + is_secure() ? std::numeric_limits::max() : (std::numeric_limits::max)(); #else - uint32_t max_receiver_buffer_size = std::numeric_limits::max(); + uint32_t max_receiver_buffer_size = (std::numeric_limits::max)(); #endif // if HAVE_SECURITY return (std::min)( diff --git a/src/cpp/rtps/reader/StatefulReader.cpp b/src/cpp/rtps/reader/StatefulReader.cpp index 6a4e4b72378..91684f7a780 100644 --- a/src/cpp/rtps/reader/StatefulReader.cpp +++ b/src/cpp/rtps/reader/StatefulReader.cpp @@ -607,7 +607,7 @@ bool StatefulReader::processDataMsg( EPROSIMA_LOG_WARNING(RTPS_MSG_IN, IDSTRING "Problem copying CacheChange, received data is: " << change->serializedPayload.length << " bytes and max size in reader " << m_guid << " is " - << (fixed_payload_size_ > 0 ? fixed_payload_size_ : std::numeric_limits::max())); + << (fixed_payload_size_ > 0 ? fixed_payload_size_ : (std::numeric_limits::max)())); change_pool_->release_cache(change_to_add); return false; } @@ -1082,7 +1082,7 @@ bool StatefulReader::change_received( } else { - a_change->reader_info.writer_ownership_strength = std::numeric_limits::max(); + a_change->reader_info.writer_ownership_strength = (std::numeric_limits::max)(); } // NOTE: Depending on QoS settings, one change can be removed from history diff --git a/src/cpp/rtps/reader/StatelessReader.cpp b/src/cpp/rtps/reader/StatelessReader.cpp index 9d59f5e9a77..db058d1959e 100644 --- a/src/cpp/rtps/reader/StatelessReader.cpp +++ b/src/cpp/rtps/reader/StatelessReader.cpp @@ -301,7 +301,7 @@ bool StatelessReader::change_received( } else { - change->reader_info.writer_ownership_strength = std::numeric_limits::max(); + change->reader_info.writer_ownership_strength = (std::numeric_limits::max)(); } if (mp_history->received_change(change, 0)) @@ -562,7 +562,7 @@ bool StatelessReader::processDataMsg( EPROSIMA_LOG_WARNING(RTPS_MSG_IN, IDSTRING "Problem copying CacheChange, received data is: " << change->serializedPayload.length << " bytes and max size in reader " << m_guid << " is " - << (fixed_payload_size_ > 0 ? fixed_payload_size_ : std::numeric_limits::max())); + << (fixed_payload_size_ > 0 ? fixed_payload_size_ : (std::numeric_limits::max)())); change_pool_->release_cache(change_to_add); return false; } diff --git a/src/cpp/rtps/security/logging/Logging.cpp b/src/cpp/rtps/security/logging/Logging.cpp index 30ea102fd08..cfe365ab6be 100644 --- a/src/cpp/rtps/security/logging/Logging.cpp +++ b/src/cpp/rtps/security/logging/Logging.cpp @@ -174,12 +174,12 @@ bool Logging::set_domain_id( const uint32_t id, SecurityException& exception) { - if (std::numeric_limits::max() == id) + if ((std::numeric_limits::max)() == id) { exception = SecurityException("Invalid domaine id value."); return false; } - else if (std::numeric_limits::max() != domain_id_) + else if ((std::numeric_limits::max)() != domain_id_) { exception = SecurityException("Domaine id already set (" + std::to_string(domain_id_) + ")"); return false; diff --git a/src/cpp/rtps/transport/shared_mem/test_SharedMemTransport.cpp b/src/cpp/rtps/transport/shared_mem/test_SharedMemTransport.cpp index b9f7faee0c7..104a61b2c4c 100644 --- a/src/cpp/rtps/transport/shared_mem/test_SharedMemTransport.cpp +++ b/src/cpp/rtps/transport/shared_mem/test_SharedMemTransport.cpp @@ -23,7 +23,7 @@ namespace rtps { test_SharedMemTransportDescriptor::test_SharedMemTransportDescriptor() : SharedMemTransportDescriptor() { - big_buffer_size_ = std::numeric_limits::max(); + big_buffer_size_ = (std::numeric_limits::max)(); big_buffer_size_send_count_ = nullptr; big_buffer_size_recv_count_ = nullptr; } diff --git a/src/cpp/security/cryptography/AESGCMGMAC_KeyFactory.cpp b/src/cpp/security/cryptography/AESGCMGMAC_KeyFactory.cpp index 176367cbc76..978049bfef5 100644 --- a/src/cpp/security/cryptography/AESGCMGMAC_KeyFactory.cpp +++ b/src/cpp/security/cryptography/AESGCMGMAC_KeyFactory.cpp @@ -314,7 +314,7 @@ std::shared_ptr AESGCMGMAC_KeyFactory::register_matched (*RPCrypto)->max_blocks_per_session = local_participant_handle->max_blocks_per_session; (*RPCrypto)->Session.session_block_counter = local_participant_handle->max_blocks_per_session + 1; - (*RPCrypto)->Session.session_id = std::numeric_limits::max(); + (*RPCrypto)->Session.session_id = (std::numeric_limits::max)(); if ((*RPCrypto)->Session.session_id == local_participant_handle->Session.session_id) { (*RPCrypto)->Session.session_id -= 1; @@ -529,7 +529,7 @@ DatareaderCryptoHandle* AESGCMGMAC_KeyFactory::register_matched_remote_datareade auto session = &(*RRCrypto)->Sessions[0]; session->session_block_counter = local_writer_handle->Sessions[0].session_block_counter; - session->session_id = std::numeric_limits::max(); + session->session_id = (std::numeric_limits::max)(); if (session->session_id == local_writer_handle->Sessions[0].session_id) { session->session_id -= 1; @@ -551,7 +551,7 @@ DatareaderCryptoHandle* AESGCMGMAC_KeyFactory::register_matched_remote_datareade session++; session->session_block_counter = local_writer_handle->Sessions[0].session_block_counter; - session->session_id = std::numeric_limits::max(); + session->session_id = (std::numeric_limits::max)(); if (session->session_id == local_writer_handle->Sessions[0].session_id) { session->session_id -= 1; @@ -732,7 +732,7 @@ DatawriterCryptoHandle* AESGCMGMAC_KeyFactory::register_matched_remote_datawrite (*RWCrypto)->max_blocks_per_session = local_reader_handle->max_blocks_per_session; auto session = &(*RWCrypto)->Sessions[0]; session->session_block_counter = local_reader_handle->Sessions[0].session_block_counter; - session->session_id = std::numeric_limits::max(); + session->session_id = (std::numeric_limits::max)(); if (session->session_id == local_reader_handle->Sessions[0].session_id) { session->session_id -= 1; diff --git a/src/cpp/security/cryptography/AESGCMGMAC_Types.h b/src/cpp/security/cryptography/AESGCMGMAC_Types.h index 8481a249bcd..5d79e761a84 100644 --- a/src/cpp/security/cryptography/AESGCMGMAC_Types.h +++ b/src/cpp/security/cryptography/AESGCMGMAC_Types.h @@ -137,7 +137,7 @@ struct SecureDataTag struct KeySessionData { - uint32_t session_id = std::numeric_limits::max(); + uint32_t session_id = (std::numeric_limits::max)(); std::array SessionKey = c_empty_key_material; uint64_t session_block_counter = 0; }; diff --git a/test/unittest/dds/topic/DDSSQLFilter/DDSSQLFilterTests.cpp b/test/unittest/dds/topic/DDSSQLFilter/DDSSQLFilterTests.cpp index 293f8dbd493..1c26f98b22a 100644 --- a/test/unittest/dds/topic/DDSSQLFilter/DDSSQLFilterTests.cpp +++ b/test/unittest/dds/topic/DDSSQLFilter/DDSSQLFilterTests.cpp @@ -785,7 +785,7 @@ class DDSSQLFilterValueGlobalData std::array& data) { constexpr uint32_t min = std::numeric_limits::lowest(); - constexpr uint32_t max = std::numeric_limits::max(); + constexpr uint32_t max = (std::numeric_limits::max)(); std::array values{ min, max / 4, max / 3, max / 2, max }; diff --git a/test/unittest/utils/BitmapRangeTests.cpp b/test/unittest/utils/BitmapRangeTests.cpp index 558a7599559..fe0cadd436e 100644 --- a/test/unittest/utils/BitmapRangeTests.cpp +++ b/test/unittest/utils/BitmapRangeTests.cpp @@ -461,7 +461,7 @@ TEST_F(BitmapRangeTests, serialization) num_bits = 20u; num_longs = 1u; - bitmap.fill(std::numeric_limits::max()); + bitmap.fill((std::numeric_limits::max)()); uut.bitmap_set(num_bits, bitmap.data()); uut.bitmap_get(num_bits, bitmap, num_longs); EXPECT_EQ(num_bits, 20u); @@ -474,14 +474,14 @@ TEST_F(BitmapRangeTests, serialization) do { uint32_t test_bits = test_longs * sizeof(value_type) * 8; - bitmap.fill(std::numeric_limits::max()); + bitmap.fill((std::numeric_limits::max)()); uut.bitmap_set(test_bits, bitmap.data()); uut.bitmap_get(num_bits, bitmap, num_longs); EXPECT_EQ(num_bits, test_bits); EXPECT_EQ(num_longs, test_longs); // use a vector as result pattern - std::vector pattern(test_longs, std::numeric_limits::max()); + std::vector pattern(test_longs, (std::numeric_limits::max)()); pattern.resize(bitmap.max_size(), 0); EXPECT_TRUE(std::equal(bitmap.begin(), bitmap.end(), pattern.begin())); } diff --git a/test/unittest/xmlparser/XMLProfileParserTests.cpp b/test/unittest/xmlparser/XMLProfileParserTests.cpp index 39e617a6fa0..deb216e260a 100644 --- a/test/unittest/xmlparser/XMLProfileParserTests.cpp +++ b/test/unittest/xmlparser/XMLProfileParserTests.cpp @@ -1729,9 +1729,9 @@ TEST_F(XMLProfileParserBasicTests, SHM_transport_descriptors_config) transport); ASSERT_NE(descriptor, nullptr); - ASSERT_EQ(descriptor->segment_size(), std::numeric_limits::max()); - ASSERT_EQ(descriptor->port_queue_capacity(), std::numeric_limits::max()); - ASSERT_EQ(descriptor->healthy_check_timeout_ms(), std::numeric_limits::max()); + ASSERT_EQ(descriptor->segment_size(), (std::numeric_limits::max)()); + ASSERT_EQ(descriptor->port_queue_capacity(), (std::numeric_limits::max)()); + ASSERT_EQ(descriptor->healthy_check_timeout_ms(), (std::numeric_limits::max)()); ASSERT_EQ(descriptor->rtps_dump_file(), "test_file.dump"); ASSERT_EQ(descriptor->maxMessageSize, 128000u); ASSERT_EQ(descriptor->max_message_size(), 128000u);