diff --git a/hazelcast/include/hazelcast/client/iexecutor_service.h b/hazelcast/include/hazelcast/client/iexecutor_service.h index 9f7250cc0a..1e39ee0a32 100644 --- a/hazelcast/include/hazelcast/client/iexecutor_service.h +++ b/hazelcast/include/hazelcast/client/iexecutor_service.h @@ -208,8 +208,8 @@ class HAZELCAST_API iexecutor_service : public proxy::ProxyImpl void execute_on_members(const HazelcastSerializable& command, const std::vector& members) { - for (std::vector::const_iterator it = members.begin(); - it != members.end(); + for (std::vector::const_iterator it = members.cbegin(); + it != members.cend(); ++it) { submit_to_member(command, *it); @@ -241,8 +241,8 @@ class HAZELCAST_API iexecutor_service : public proxy::ProxyImpl { std::vector memberList = get_context().get_client_cluster_service().get_member_list(); - for (std::vector::const_iterator it = memberList.begin(); - it != memberList.end(); + for (std::vector::const_iterator it = memberList.cbegin(); + it != memberList.cend(); ++it) { submit_to_member(command, *it); diff --git a/hazelcast/include/hazelcast/client/imap.h b/hazelcast/include/hazelcast/client/imap.h index f8f98649ca..85b60a4ae5 100644 --- a/hazelcast/include/hazelcast/client/imap.h +++ b/hazelcast/include/hazelcast/client/imap.h @@ -1063,7 +1063,7 @@ class HAZELCAST_API imap : public proxy::IMapImpl resultFutures.push_back( put_all_internal(partitionId, std::move(partitionEntry.second))); } - return boost::when_all(resultFutures.begin(), resultFutures.end()) + return boost::when_all(resultFutures.cbegin(), resultFutures.cend()) .then(boost::launch::sync, [](boost::future>> futures) { @@ -1308,8 +1308,8 @@ class HAZELCAST_API imap : public proxy::IMapImpl query::iteration_type iteration_type, std::vector>> entries) { - std::sort(entries.begin(), - entries.end(), + std::sort(entries.cbegin(), + entries.cend(), [&](const std::pair>& lhs, const std::pair>& rhs) { auto comparator = predicate.getComparator(); diff --git a/hazelcast/include/hazelcast/client/internal/config/ConfigUtils.h b/hazelcast/include/hazelcast/client/internal/config/ConfigUtils.h index e73f78451b..3bc6640f1b 100644 --- a/hazelcast/include/hazelcast/client/internal/config/ConfigUtils.h +++ b/hazelcast/include/hazelcast/client/internal/config/ConfigUtils.h @@ -37,7 +37,7 @@ class ConfigUtils const std::string& item_name) { auto candidate = config_patterns.find(item_name); - if (candidate != config_patterns.end()) { + if (candidate != config_patterns.cend()) { return &candidate->second; } auto size = config_patterns.size(); @@ -50,7 +50,7 @@ class ConfigUtils config_pattern_matcher.matches(keys, item_name); if (configPatternKey) { candidate = config_patterns.find(*configPatternKey); - if (candidate != config_patterns.end()) { + if (candidate != config_patterns.cend()) { return &candidate->second; } } diff --git a/hazelcast/include/hazelcast/client/internal/nearcache/impl/store/BaseHeapNearCacheRecordStore.h b/hazelcast/include/hazelcast/client/internal/nearcache/impl/store/BaseHeapNearCacheRecordStore.h index 7b9abf46c1..0045edad70 100644 --- a/hazelcast/include/hazelcast/client/internal/nearcache/impl/store/BaseHeapNearCacheRecordStore.h +++ b/hazelcast/include/hazelcast/client/internal/nearcache/impl/store/BaseHeapNearCacheRecordStore.h @@ -77,8 +77,8 @@ class BaseHeapNearCacheRecordStore entries = ANCRS::records_->entry_set(); for (typename std::vector, std::shared_ptr>>::const_iterator - it = entries.begin(); - it != entries.end(); + it = entries.cbegin(); + it != entries.cend(); ++it) { const std::pair, std::shared_ptr>& entry = (*it); diff --git a/hazelcast/include/hazelcast/client/internal/nearcache/impl/store/HeapNearCacheRecordMap.h b/hazelcast/include/hazelcast/client/internal/nearcache/impl/store/HeapNearCacheRecordMap.h index 9945883138..88376dbc64 100644 --- a/hazelcast/include/hazelcast/client/internal/nearcache/impl/store/HeapNearCacheRecordMap.h +++ b/hazelcast/include/hazelcast/client/internal/nearcache/impl/store/HeapNearCacheRecordMap.h @@ -127,8 +127,8 @@ class HeapNearCacheRecordMap } int actualEvictedCount = 0; for (typename std::vector>::const_iterator it = - eviction_candidates->begin(); - it != eviction_candidates->end(); + eviction_candidates->cbegin(); + it != eviction_candidates->cend(); ++it) { const std::shared_ptr& evictionCandidate = *it; if (util::SynchronizedMap, R>::remove( diff --git a/hazelcast/include/hazelcast/client/map/NearCachedClientMapProxy.h b/hazelcast/include/hazelcast/client/map/NearCachedClientMapProxy.h index aee68dc0b7..f6eaafe804 100644 --- a/hazelcast/include/hazelcast/client/map/NearCachedClientMapProxy.h +++ b/hazelcast/include/hazelcast/client/map/NearCachedClientMapProxy.h @@ -404,7 +404,7 @@ class NearCachedClientMapProxy std::move(entry.second)); bool marked = false; auto foundEntry = markers->find(key); - if (foundEntry != markers->end()) { + if (foundEntry != markers->cend()) { marked = foundEntry->second; markers->erase(foundEntry); } @@ -601,8 +601,8 @@ class NearCachedClientMapProxy void unmark_remaining_marked_keys(MARKER_MAP& markers) { - for (MARKER_MAP::const_iterator it = markers.begin(); - it != markers.end(); + for (MARKER_MAP::const_iterator it = markers.cbegin(); + it != markers.cend(); ++it) { if (it->second) { key_state_marker_->force_unmark(*it->first); diff --git a/hazelcast/include/hazelcast/client/pipelining.h b/hazelcast/include/hazelcast/client/pipelining.h index 1a0e59ec9c..20397f70fc 100644 --- a/hazelcast/include/hazelcast/client/pipelining.h +++ b/hazelcast/include/hazelcast/client/pipelining.h @@ -117,7 +117,7 @@ class pipelining : public std::enable_shared_from_this> { std::vector> result; result.reserve(futures_.size()); - auto result_futures = when_all(futures_.begin(), futures_.end()); + auto result_futures = when_all(futures_.cbegin(), futures_.cend()); for (auto& f : result_futures.get()) { result.emplace_back(f.get()); } @@ -163,8 +163,8 @@ class pipelining : public std::enable_shared_from_this> } if (!outStandingFutures.empty()) { - boost::when_any(outStandingFutures.begin(), - outStandingFutures.end()) + boost::when_any(outStandingFutures.cbegin(), + outStandingFutures.cend()) .get(); } } diff --git a/hazelcast/include/hazelcast/client/protocol/ClientMessageBuilder.h b/hazelcast/include/hazelcast/client/protocol/ClientMessageBuilder.h index 260165e108..4c56063984 100644 --- a/hazelcast/include/hazelcast/client/protocol/ClientMessageBuilder.h +++ b/hazelcast/include/hazelcast/client/protocol/ClientMessageBuilder.h @@ -103,7 +103,7 @@ class ClientMessageBuilder bool result = false; auto found = partial_messages_.find(fragmentation_id); - if (partial_messages_.end() != found) { + if (partial_messages_.cend() != found) { found->second->append(std::move(msg)); if (is_end_fragment) { // remove from message from map diff --git a/hazelcast/include/hazelcast/client/proxy/SerializingProxy.h b/hazelcast/include/hazelcast/client/proxy/SerializingProxy.h index fdbb9afb8b..cfed719157 100644 --- a/hazelcast/include/hazelcast/client/proxy/SerializingProxy.h +++ b/hazelcast/include/hazelcast/client/proxy/SerializingProxy.h @@ -97,7 +97,7 @@ class HAZELCAST_API SerializingProxy inline boost::future> to_object_map( std::vector>& futures) { - return boost::when_all(futures.begin(), futures.end()) + return boost::when_all(futures.cbegin(), futures.cend()) .then(boost::launch::sync, [this]( boost::future>> diff --git a/hazelcast/include/hazelcast/client/serialization/pimpl/data_output.h b/hazelcast/include/hazelcast/client/serialization/pimpl/data_output.h index 1c32e66d51..7babaa6bac 100644 --- a/hazelcast/include/hazelcast/client/serialization/pimpl/data_output.h +++ b/hazelcast/include/hazelcast/client/serialization/pimpl/data_output.h @@ -216,12 +216,12 @@ const std::vector& data_output::to_byte_array() const void data_output::append_bytes(const std::vector& bytes) { - output_stream_.insert(output_stream_.end(), bytes.begin(), bytes.end()); + output_stream_.insert(output_stream_.cend(), bytes.cbegin(), bytes.cend()); } void data_output::write_zero_bytes(size_t number_of_bytes) { - output_stream_.insert(output_stream_.end(), number_of_bytes, 0); + output_stream_.insert(output_stream_.cend(), number_of_bytes, 0); } size_t data_output::position() const diff --git a/hazelcast/include/hazelcast/client/serialization/serialization.h b/hazelcast/include/hazelcast/client/serialization/serialization.h index ce9a4c4d9c..fcea81b471 100644 --- a/hazelcast/include/hazelcast/client/serialization/serialization.h +++ b/hazelcast/include/hazelcast/client/serialization/serialization.h @@ -599,7 +599,7 @@ class HAZELCAST_API ClassDefinition * Internal API * @param fieldDefinition to be added */ - void add_field_def(FieldDefinition& field_definition); + void add_field_def(const FieldDefinition& field_definition); /** * @param fieldName field name diff --git a/hazelcast/include/hazelcast/client/spi/ProxyManager.h b/hazelcast/include/hazelcast/client/spi/ProxyManager.h index b6c01f601e..89b5ce4490 100644 --- a/hazelcast/include/hazelcast/client/spi/ProxyManager.h +++ b/hazelcast/include/hazelcast/client/spi/ProxyManager.h @@ -55,7 +55,7 @@ class HAZELCAST_API ProxyManager std::lock_guard guard(lock_); auto it = proxies_.find(ns); - if (it != proxies_.end()) { + if (it != proxies_.cend()) { auto proxy_future = it->second; return convert_to_concrete_proxy_future(proxy_future); } diff --git a/hazelcast/include/hazelcast/util/ByteBuffer.h b/hazelcast/include/hazelcast/util/ByteBuffer.h index 8b108d3052..31d7c5b800 100644 --- a/hazelcast/include/hazelcast/util/ByteBuffer.h +++ b/hazelcast/include/hazelcast/util/ByteBuffer.h @@ -61,7 +61,7 @@ class HAZELCAST_API ByteBuffer { size_t numBytesToCopy = std::min(lim_ - pos_, len); target.insert( - target.end(), buffer_ + pos_, buffer_ + pos_ + numBytesToCopy); + target.cend(), buffer_ + pos_, buffer_ + pos_ + numBytesToCopy); pos_ += numBytesToCopy; return numBytesToCopy; } diff --git a/hazelcast/include/hazelcast/util/SynchronizedMap.h b/hazelcast/include/hazelcast/util/SynchronizedMap.h index d166b4f813..b27f88e4ab 100644 --- a/hazelcast/include/hazelcast/util/SynchronizedMap.h +++ b/hazelcast/include/hazelcast/util/SynchronizedMap.h @@ -62,7 +62,7 @@ class SynchronizedMap bool contains_key(const K& key) const { std::lock_guard guard(map_lock_); - return internal_map_.find(key) != internal_map_.end(); + return internal_map_.find(key) != internal_map_.cend(); } /** @@ -91,7 +91,7 @@ class SynchronizedMap std::lock_guard lg(map_lock_); std::shared_ptr returnValue; auto foundIter = internal_map_.find(key); - if (foundIter != internal_map_.end()) { + if (foundIter != internal_map_.cend()) { returnValue = foundIter->second; } internal_map_[key] = value; @@ -107,7 +107,7 @@ class SynchronizedMap { std::lock_guard lg(map_lock_); auto foundIter = internal_map_.find(key); - if (foundIter != internal_map_.end()) { + if (foundIter != internal_map_.cend()) { return foundIter->second; } @@ -124,7 +124,7 @@ class SynchronizedMap { std::lock_guard lg(map_lock_); auto foundIter = internal_map_.find(key); - if (foundIter != internal_map_.end()) { + if (foundIter != internal_map_.cend()) { std::shared_ptr v = foundIter->second; internal_map_.erase(foundIter); return v; @@ -137,7 +137,7 @@ class SynchronizedMap { std::lock_guard lg(map_lock_); auto foundIter = internal_map_.find(key); - if (foundIter != internal_map_.end()) { + if (foundIter != internal_map_.cend()) { auto& foundValue = foundIter->second; if (!value || !foundValue) { if (value == foundValue) { @@ -228,7 +228,7 @@ class SynchronizedMap if (index >= internal_map_.size()) { return std::unique_ptr>>(); } - auto it = internal_map_.begin(); + auto it = internal_map_.cbegin(); for (size_t i = 0; i < index; ++i) { ++it; } @@ -251,7 +251,7 @@ class SynchronizedMap { std::lock_guard lg(map_lock_); - for (auto iter = internal_map_.begin(); iter != internal_map_.end();) { + for (auto iter = internal_map_.cbegin(); iter != internal_map_.cend();) { if (iter->second != nullptr && comp(*(iter->second))) { iter = internal_map_.erase(iter); } else { diff --git a/hazelcast/include/hazelcast/util/SynchronizedQueue.h b/hazelcast/include/hazelcast/util/SynchronizedQueue.h index ad992af80d..b06ba254e1 100644 --- a/hazelcast/include/hazelcast/util/SynchronizedQueue.h +++ b/hazelcast/include/hazelcast/util/SynchronizedQueue.h @@ -63,8 +63,8 @@ class SynchronizedQueue std::lock_guard lg(m); std::vector> values; for (typename std::deque>::const_iterator it = - internalQueue.begin(); - it != internalQueue.end(); + internalQueue.cbegin(); + it != internalQueue.cend(); ++it) { values.push_back(*it); } diff --git a/hazelcast/src/hazelcast/client/client_impl.cpp b/hazelcast/src/hazelcast/client/client_impl.cpp index 805886da06..145f4c5e83 100644 --- a/hazelcast/src/hazelcast/client/client_impl.cpp +++ b/hazelcast/src/hazelcast/client/client_impl.cpp @@ -777,7 +777,7 @@ from_bytes(std::vector v) if (is_negative) { twos_complement(v); } - import_bits(i, v.begin(), v.end(), 8); + import_bits(i, v.cbegin(), v.cend(), 8); if (is_negative) { return -i; } @@ -793,12 +793,12 @@ to_bytes(const boost::multiprecision::cpp_int& i) twos_complement(v); if (v[0] > 0) { // add -1 as the most significant to have a negative sign bit - v.insert(v.begin(), -1); + v.insert(v.cbegin(), -1); } } else { // add 0 as the most significant byte to have a positive sign bit if (v[0] < 0) { - v.insert(v.begin(), 0); + v.insert(v.cbegin(), 0); } } return v; @@ -1156,7 +1156,7 @@ client_properties::get_string(const client_property& property) const { std::unordered_map::const_iterator valueIt = properties_map_.find(property.get_name()); - if (valueIt != properties_map_.end()) { + if (valueIt != properties_map_.cend()) { return valueIt->second; } diff --git a/hazelcast/src/hazelcast/client/cluster.cpp b/hazelcast/src/hazelcast/client/cluster.cpp index 573de49893..a5120bacce 100644 --- a/hazelcast/src/hazelcast/client/cluster.cpp +++ b/hazelcast/src/hazelcast/client/cluster.cpp @@ -129,7 +129,7 @@ member::get_attribute(const std::string& key) const { std::unordered_map::const_iterator it = attributes_.find(key); - if (attributes_.end() != it) { + if (attributes_.cend() != it) { return &(it->second); } else { return NULL; @@ -145,7 +145,7 @@ member::get_version() const bool member::lookup_attribute(const std::string& key) const { - return attributes_.find(key) != attributes_.end(); + return attributes_.find(key) != attributes_.cend(); } bool diff --git a/hazelcast/src/hazelcast/client/compact.cpp b/hazelcast/src/hazelcast/client/compact.cpp index 15ffad77de..3cec32a0d9 100644 --- a/hazelcast/src/hazelcast/client/compact.cpp +++ b/hazelcast/src/hazelcast/client/compact.cpp @@ -2416,7 +2416,7 @@ compact_reader::is_field_exists(const std::string& field_name, { const auto& fields = schema.fields(); const auto& field_descriptor = fields.find(field_name); - if (field_descriptor == fields.end()) { + if (field_descriptor == fields.cend()) { return false; } return field_descriptor->second.kind == kind; @@ -2427,7 +2427,7 @@ compact_reader::get_field_descriptor(const std::string& field_name) const { const auto& fields = schema.fields(); const auto& field_descriptor = fields.find(field_name); - if (field_descriptor == fields.end()) { + if (field_descriptor == fields.cend()) { BOOST_THROW_EXCEPTION(unknown_field(field_name)); } return field_descriptor->second; @@ -3249,7 +3249,7 @@ default_compact_writer::check_field_definition(const std::string& field_name, field_kind kind) const { auto iterator = schema_.fields().find(field_name); - if (iterator == schema_.fields().end()) { + if (iterator == schema_.fields().cend()) { BOOST_THROW_EXCEPTION(exception::hazelcast_serialization( "default_compact_writer", (boost::format("Invalid field name %1% for %2%") % field_name % @@ -3391,7 +3391,7 @@ schema::schema( std::vector variable_size_fields; std::map sorted_fields( - field_definition_map_.begin(), field_definition_map_.end()); + field_definition_map_.cbegin(), field_definition_map_.cend()); for (auto& item : sorted_fields) { field_descriptor& descriptor = item.second; field_kind kind = descriptor.kind; diff --git a/hazelcast/src/hazelcast/client/config.cpp b/hazelcast/src/hazelcast/client/config.cpp index a3a00c16bd..d6df5773b7 100644 --- a/hazelcast/src/hazelcast/client/config.cpp +++ b/hazelcast/src/hazelcast/client/config.cpp @@ -383,7 +383,7 @@ client_network_config& client_network_config::add_addresses(const std::vector
& addresses) { address_list_.insert( - address_list_.end(), addresses.begin(), addresses.end()); + address_list_.cend(), addresses.cbegin(), addresses.cend()); return *this; } @@ -1179,7 +1179,7 @@ const config::reliable_topic_config& client_config::get_reliable_topic_config(const std::string& name) { auto it = reliable_topic_config_map_.find(name); - if (it != reliable_topic_config_map_.end()) { + if (it != reliable_topic_config_map_.cend()) { return it->second; } @@ -1192,7 +1192,7 @@ const config::reliable_topic_config* client_config::lookup_reliable_topic_config(const std::string& name) const { auto it = reliable_topic_config_map_.find(name); - if (it != reliable_topic_config_map_.end()) { + if (it != reliable_topic_config_map_.cend()) { return &it->second; } @@ -1224,7 +1224,7 @@ client_config::get_near_cache_config(const std::string& name) const } auto config_it = near_cache_config_map_.find("default"); - if (config_it != near_cache_config_map_.end()) { + if (config_it != near_cache_config_map_.cend()) { return &near_cache_config_map_.find("default")->second; } @@ -1308,7 +1308,7 @@ client_config::get_flake_id_generator_config(const std::string& name) return config; } auto defConfig = flake_id_generator_config_map_.find("default"); - if (defConfig == flake_id_generator_config_map_.end()) { + if (defConfig == flake_id_generator_config_map_.cend()) { flake_id_generator_config_map_.emplace( "default", config::client_flake_id_generator_config("default")); } diff --git a/hazelcast/src/hazelcast/client/discovery.cpp b/hazelcast/src/hazelcast/client/discovery.cpp index 51a4b4b252..3e9f3a22f5 100644 --- a/hazelcast/src/hazelcast/client/discovery.cpp +++ b/hazelcast/src/hazelcast/client/discovery.cpp @@ -116,10 +116,10 @@ ec2_request_signer::get_canonicalized_query_string( const std::vector& list) const { std::ostringstream result; - std::vector::const_iterator it = list.begin(); + std::vector::const_iterator it = list.cbegin(); result << (*it); ++it; - for (; it != list.end(); ++it) { + for (; it != list.cend(); ++it) { result << "&" << *it; } return result.str(); @@ -557,7 +557,7 @@ DescribeInstances::add_filters() filter.add_filter("instance-state-name", "running"); const std::unordered_map& filters = filter.get_filters(); - attributes_.insert(filters.begin(), filters.end()); + attributes_.insert(filters.cbegin(), filters.cend()); } } // namespace impl @@ -578,7 +578,7 @@ aws_url_encoder::escape_encode(const std::string& value) escaped.fill('0'); escaped << std::hex; - for (std::string::const_iterator i = value.begin(), n = value.end(); i != n; + for (std::string::const_iterator i = value.cbegin(), n = value.cend(); i != n; ++i) { std::string::value_type c = (*i); diff --git a/hazelcast/src/hazelcast/client/metrics.cpp b/hazelcast/src/hazelcast/client/metrics.cpp index d6a7861c6a..25c59f174f 100644 --- a/hazelcast/src/hazelcast/client/metrics.cpp +++ b/hazelcast/src/hazelcast/client/metrics.cpp @@ -197,7 +197,7 @@ metrics_dictionary::get_dictionary_id(const std::string& word) auto word_position = word_to_id.find(word); - if (word_position == word_to_id.end()) { + if (word_position == word_to_id.cend()) { const int next_id = static_cast(word_to_id.size()); word_to_id[word] = next_id; @@ -267,7 +267,7 @@ output_buffer::write(const std::string& str) void output_buffer::write(const std::vector& vec) { - buffer_.insert(buffer_.end(), vec.begin(), vec.end()); + buffer_.insert(buffer_.cend(), vec.cbegin(), vec.cend()); } const std::vector& diff --git a/hazelcast/src/hazelcast/client/near_cache.cpp b/hazelcast/src/hazelcast/client/near_cache.cpp index 30c5b94da3..1c79ae7fbe 100644 --- a/hazelcast/src/hazelcast/client/near_cache.cpp +++ b/hazelcast/src/hazelcast/client/near_cache.cpp @@ -48,9 +48,9 @@ NearCacheManager::clear_all_near_caches() { std::vector> caches = near_cache_map_.values(); - for (std::vector>::iterator it = - caches.begin(); - it != caches.end(); + for (std::vector>::const_iterator it = + caches.cbegin(); + it != caches.cend(); ++it) { (*it)->clear(); } @@ -71,9 +71,9 @@ NearCacheManager::destroy_all_near_caches() { std::vector> caches = near_cache_map_.values(); - for (std::vector>::iterator it = - caches.begin(); - it != caches.end(); + for (std::vector>::const_iterator it = + caches.cbegin(); + it != caches.cend(); ++it) { (*it)->destroy(); } diff --git a/hazelcast/src/hazelcast/client/network.cpp b/hazelcast/src/hazelcast/client/network.cpp index 980082e428..ccd184175a 100644 --- a/hazelcast/src/hazelcast/client/network.cpp +++ b/hazelcast/src/hazelcast/client/network.cpp @@ -546,8 +546,8 @@ ClientConnectionManagerImpl::do_connect_to_cluster() return; } } - tried_addresses.insert(tried_addresses_per_attempt.begin(), - tried_addresses_per_attempt.end()); + tried_addresses.insert(tried_addresses_per_attempt.cbegin(), + tried_addresses_per_attempt.cend()); // If the address provider loads no addresses, then the above loop is // not entered and the lifecycle check is missing, hence we need to // repeat the same check at this point. @@ -586,7 +586,7 @@ ClientConnectionManagerImpl::get_possible_member_addresses() } addresses.insert( - addresses.end(), provided_addresses.begin(), provided_addresses.end()); + addresses.cend(), provided_addresses.cbegin(), provided_addresses.cend()); return addresses; } @@ -1040,7 +1040,7 @@ ClientConnectionManagerImpl::notify_backup(int64_t call_id) } boost::asio::post(connection->get_socket().get_executor(), [=]() { auto invocation_it = connection->invocations.find(call_id); - if (invocation_it != connection->invocations.end()) { + if (invocation_it != connection->invocations.cend()) { invocation_it->second->notify_backup(); } }); @@ -1074,7 +1074,7 @@ ClientConnectionManagerImpl::translate(const member& m) { if (use_public_address_) { auto public_addr_it = m.address_map().find(PUBLIC_ENDPOINT_QUALIFIER); - if (public_addr_it != m.address_map().end()) { + if (public_addr_it != m.address_map().cend()) { return public_addr_it->second; } return m.get_address(); @@ -1330,7 +1330,7 @@ Connection::handle_client_message( { auto correlationId = message->get_correlation_id(); auto invocationIterator = invocations.find(correlationId); - if (invocationIterator == invocations.end()) { + if (invocationIterator == invocations.cend()) { HZ_LOG(logger_, warning, boost::str(boost::format("No invocation for callId: %1%. " diff --git a/hazelcast/src/hazelcast/client/protocol.cpp b/hazelcast/src/hazelcast/client/protocol.cpp index cfc67f26f7..2de2990c98 100644 --- a/hazelcast/src/hazelcast/client/protocol.cpp +++ b/hazelcast/src/hazelcast/client/protocol.cpp @@ -291,7 +291,7 @@ ClientMessage::append(std::shared_ptr msg) // since we make sure that this is guaranteed at the caller that they are // matching ! data_buffer_.insert( - data_buffer_.end(), msg->data_buffer_.begin(), msg->data_buffer_.end()); + data_buffer_.cend(), msg->data_buffer_.cbegin(), msg->data_buffer_.cend()); } bool @@ -428,8 +428,8 @@ ClientMessage::end_frame() void ClientMessage::drop_fragmentation_frame() { - data_buffer_[0].erase(data_buffer_[0].begin(), - data_buffer_[0].begin() + FRAGMENTATION_ID_OFFSET + + data_buffer_[0].erase(data_buffer_[0].cbegin(), + data_buffer_[0].cbegin() + FRAGMENTATION_ID_OFFSET + INT64_SIZE); } @@ -709,8 +709,8 @@ ClientExceptionFactory::~ClientExceptionFactory() for (std::unordered_map< int, hazelcast::client::protocol::ExceptionFactory*>::const_iterator it = - error_code_to_factory_.begin(); - error_code_to_factory_.end() != it; + error_code_to_factory_.cbegin(); + error_code_to_factory_.cend() != it; ++it) { delete (it->second); } @@ -721,7 +721,7 @@ ClientExceptionFactory::register_exception(int32_t error_code, ExceptionFactory* factory) { auto it = error_code_to_factory_.find(error_code); - if (error_code_to_factory_.end() != it) { + if (error_code_to_factory_.cend() != it) { char msg[100]; util::hz_snprintf( msg, 100, "Error code %d was already registered!!!", error_code); @@ -741,7 +741,7 @@ ClientExceptionFactory::create_exception( return nullptr; } auto factory = error_code_to_factory_.find(begin->error_code); - if (error_code_to_factory_.end() == factory) { + if (error_code_to_factory_.cend() == factory) { factory = error_code_to_factory_.find( protocol::client_protocol_error_codes::UNDEFINED); } @@ -756,7 +756,7 @@ std::exception_ptr ClientExceptionFactory::create_exception( const std::vector& errors) const { - return create_exception(errors.begin(), errors.end()); + return create_exception(errors.cbegin(), errors.cend()); } UsernamePasswordCredentials::UsernamePasswordCredentials( diff --git a/hazelcast/src/hazelcast/client/proxy.cpp b/hazelcast/src/hazelcast/client/proxy.cpp index a2eb603b2b..cd4409c384 100644 --- a/hazelcast/src/hazelcast/client/proxy.cpp +++ b/hazelcast/src/hazelcast/client/proxy.cpp @@ -580,7 +580,7 @@ PNCounterImpl::get_crdt_operation_target( { auto replicaAddress = current_target_replica_address_.load(); if (replicaAddress && - excluded_addresses.find(*replicaAddress) == excluded_addresses.end()) { + excluded_addresses.find(*replicaAddress) == excluded_addresses.cend()) { return replicaAddress; } @@ -588,7 +588,7 @@ PNCounterImpl::get_crdt_operation_target( std::lock_guard guard(target_selection_mutex_); replicaAddress = current_target_replica_address_.load(); if (!replicaAddress || excluded_addresses.find(*replicaAddress) != - excluded_addresses.end()) { + excluded_addresses.cend()) { current_target_replica_address_ = choose_target_replica(excluded_addresses); } @@ -624,7 +624,7 @@ PNCounterImpl::get_replica_addresses( std::vector replicaMembers; for (int i = 0; i < currentReplicaCount; i++) { - if (excluded_members.find(dataMembers[i]) == excluded_members.end()) { + if (excluded_members.find(dataMembers[i]) == excluded_members.cend()) { replicaMembers.push_back(dataMembers[i]); } } diff --git a/hazelcast/src/hazelcast/client/serialization.cpp b/hazelcast/src/hazelcast/client/serialization.cpp index 0e7f03b154..af73fbfb95 100644 --- a/hazelcast/src/hazelcast/client/serialization.cpp +++ b/hazelcast/src/hazelcast/client/serialization.cpp @@ -208,9 +208,9 @@ ClassDefinitionBuilder::build() std::shared_ptr cd( new ClassDefinition(factory_id_, class_id_, version_)); - std::vector::iterator fdIt; - for (fdIt = field_definitions_.begin(); fdIt != field_definitions_.end(); - fdIt++) { + std::vector::const_iterator fdIt; + for (fdIt = field_definitions_.cbegin(); fdIt != field_definitions_.cend(); + ++fdIt) { cd->add_field_def(*fdIt); } return cd; @@ -449,7 +449,7 @@ ClassDefinition::ClassDefinition(int factory_id, int class_id, int version) {} void -ClassDefinition::add_field_def(FieldDefinition& fd) +ClassDefinition::add_field_def(const FieldDefinition& fd) { field_definitions_map_[fd.get_name()] = fd; } @@ -458,7 +458,7 @@ const FieldDefinition& ClassDefinition::get_field(const std::string& name) const { auto it = field_definitions_map_.find(name); - if (it != field_definitions_map_.end()) { + if (it != field_definitions_map_.cend()) { return it->second; } BOOST_THROW_EXCEPTION(exception::hazelcast_serialization( @@ -473,7 +473,7 @@ bool ClassDefinition::has_field(const std::string& field_name) const { return field_definitions_map_.find(field_name) != - field_definitions_map_.end(); + field_definitions_map_.cend(); } field_type @@ -645,7 +645,7 @@ data_output::write(int16_t value) } else { boost::endian::native_to_little_inplace(value); } - output_stream_.insert(output_stream_.end(), + output_stream_.insert(output_stream_.cend(), (byte*)&value, (byte*)&value + util::Bits::SHORT_SIZE_IN_BYTES); } @@ -661,7 +661,7 @@ data_output::write(int32_t value, boost::endian::order byte_order) } else { boost::endian::native_to_little_inplace(value); } - output_stream_.insert(output_stream_.end(), + output_stream_.insert(output_stream_.cend(), (byte*)&value, (byte*)&value + util::Bits::INT_SIZE_IN_BYTES); } @@ -685,7 +685,7 @@ data_output::write(int64_t value) } else { boost::endian::native_to_little_inplace(value); } - output_stream_.insert(output_stream_.end(), + output_stream_.insert(output_stream_.cend(), (byte*)&value, (byte*)&value + util::Bits::LONG_SIZE_IN_BYTES); } @@ -736,7 +736,7 @@ data_output::write(boost::uuids::uuid v) *reinterpret_cast(&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_.cend(), v.data, v.data + util::Bits::UUID_SIZE_IN_BYTES); } template<> @@ -768,7 +768,7 @@ data_output::write(const std::string& str) } write(str.size()); - output_stream_.insert(output_stream_.end(), str.begin(), str.end()); + output_stream_.insert(output_stream_.cend(), str.cbegin(), str.cend()); } template<> @@ -1014,7 +1014,7 @@ DefaultPortableWriter::set_position(const std::string& field_name, try { FieldDefinition const& fd = cd_->get_field(field_name); - if (written_fields_.find(field_name) != written_fields_.end()) { + if (written_fields_.find(field_name) != written_fields_.cend()) { BOOST_THROW_EXCEPTION(exception::hazelcast_serialization( "PortableWriter::setPosition", "Field '" + std::string(field_name) + diff --git a/hazelcast/src/hazelcast/client/spi.cpp b/hazelcast/src/hazelcast/client/spi.cpp index c6b8331b4a..13c31dc2fb 100644 --- a/hazelcast/src/hazelcast/client/spi.cpp +++ b/hazelcast/src/hazelcast/client/spi.cpp @@ -141,8 +141,8 @@ ProxyManager::destroy_proxy(ClientProxy& proxy) { std::lock_guard guard(lock_); auto it = proxies_.find(objectNamespace); - registeredProxy = it == proxies_.end() ? nullptr : it->second.get(); - if (it != proxies_.end()) { + registeredProxy = it == proxies_.cend() ? nullptr : it->second.get(); + if (it != proxies_.cend()) { proxies_.erase(it); } } @@ -922,7 +922,7 @@ ClientClusterServiceImpl::get_member(boost::uuids::uuid uuid) const assert(!uuid.is_nil()); auto members_view_ptr = member_list_snapshot_.load(); const auto it = members_view_ptr->members.find(uuid); - if (it == members_view_ptr->members.end()) { + if (it == members_view_ptr->members.cend()) { return boost::none; } return { it->second }; @@ -1124,11 +1124,11 @@ ClientClusterServiceImpl::create_snapshot(int32_t version, } else { auto found = address_map.find(CLIENT); address member_address; - if (found != address_map.end()) { + if (found != address_map.cend()) { member_address = found->second; } else { found = address_map.find(MEMBER); - assert(found != address_map.end()); + assert(found != address_map.cend()); member_address = found->second; } member new_member(member_address, @@ -2279,7 +2279,7 @@ ClientPartitionServiceImpl::get_partition_owner(int32_t partition_id) { auto table_ptr = partition_table_.load(); auto it = table_ptr->partitions.find(partition_id); - if (it != table_ptr->partitions.end()) { + if (it != table_ptr->partitions.cend()) { return it->second; } return boost::uuids::nil_uuid(); @@ -2797,8 +2797,8 @@ listener_service_impl::deregister_listener_internal( auto listener_registrations = listenerRegistration->registrations.entry_set(); - for (auto it = listener_registrations.begin(); - it != listener_registrations.end();) { + for (auto it = listener_registrations.cbegin(); + it != listener_registrations.cend();) { const auto& registration = it->second; const auto& subscriber = it->first; try { @@ -3150,7 +3150,7 @@ remote_address_provider::translate(const address& addr) { std::lock_guard guard(lock_); auto found = private_to_public_.find(addr); - if (found != private_to_public_.end()) { + if (found != private_to_public_.cend()) { return found->second; } } @@ -3161,7 +3161,7 @@ remote_address_provider::translate(const address& addr) private_to_public_ = address_map; auto found = private_to_public_.find(addr); - if (found != private_to_public_.end()) { + if (found != private_to_public_.cend()) { return found->second; } diff --git a/hazelcast/src/hazelcast/client/sql.cpp b/hazelcast/src/hazelcast/client/sql.cpp index 6dc005aa6c..26e9b26412 100644 --- a/hazelcast/src/hazelcast/client/sql.cpp +++ b/hazelcast/src/hazelcast/client/sql.cpp @@ -1305,7 +1305,7 @@ sql_row_metadata::find_column(const std::string& column_name) const sql_row_metadata::const_iterator sql_row_metadata::end() const { - return name_to_index_.end(); + return name_to_index_.cend(); } bool operator==(const sql_row_metadata& lhs, const sql_row_metadata& rhs) diff --git a/hazelcast/src/hazelcast/cp/cp_impl.cpp b/hazelcast/src/hazelcast/cp/cp_impl.cpp index 37b887fad4..bd0a6a0709 100644 --- a/hazelcast/src/hazelcast/cp/cp_impl.cpp +++ b/hazelcast/src/hazelcast/cp/cp_impl.cpp @@ -62,12 +62,12 @@ proxy_session_manager::get_or_create_session(const raft_group_id& group_id) } auto session = sessions_.find(group_id); - if (session == sessions_.end() || !session->second.is_valid()) { + if (session == sessions_.cend() || !session->second.is_valid()) { // upgrade to write lock boost::upgrade_to_unique_lock write_lock( read_lock); session = sessions_.find(group_id); - if (session == sessions_.end() || !session->second.is_valid()) { + if (session == sessions_.cend() || !session->second.is_valid()) { session = create_new_session(group_id); } } @@ -175,7 +175,7 @@ proxy_session_manager::invalidate_session(const raft_group_id& group_id, { boost::upgrade_lock read_lock(lock_); auto session = sessions_.find(group_id); - if (session != sessions_.end()) { + if (session != sessions_.cend()) { // upgrade to write lock boost::upgrade_to_unique_lock write_lock( read_lock); @@ -198,7 +198,7 @@ proxy_session_manager::release_session(const raft_group_id& group_id, { boost::upgrade_lock read_lock(lock_); auto session = sessions_.find(group_id); - if (session != sessions_.end() && session->second.id == session_id) { + if (session != sessions_.cend() && session->second.id == session_id) { session->second.release(count); } } @@ -208,7 +208,7 @@ proxy_session_manager::get_session(const raft_group_id& group_id) { boost::upgrade_lock read_lock(lock_); auto session = sessions_.find(group_id); - return session == sessions_.end() ? NO_SESSION_ID : session->second.id; + return session == sessions_.cend() ? NO_SESSION_ID : session->second.id; } int64_t @@ -218,7 +218,7 @@ proxy_session_manager::get_or_create_unique_thread_id( boost::upgrade_lock read_lock(lock_); auto key = std::make_pair(group_id, util::get_current_thread_id()); auto global_thread_id_it = thread_ids_.find(key); - if (global_thread_id_it != thread_ids_.end()) { + if (global_thread_id_it != thread_ids_.cend()) { return global_thread_id_it->second; } @@ -227,7 +227,7 @@ proxy_session_manager::get_or_create_unique_thread_id( // upgrade to write lock boost::upgrade_to_unique_lock write_lock(read_lock); global_thread_id_it = thread_ids_.find(key); - if (global_thread_id_it != thread_ids_.end()) { + if (global_thread_id_it != thread_ids_.cend()) { return global_thread_id_it->second; } @@ -274,7 +274,7 @@ proxy_session_manager::get_session_acquire_count(const raft_group_id& group_id, { boost::upgrade_lock read_lock(lock_); auto session = sessions_.find(group_id); - return session != sessions_.end() && session->second.id == session_id + return session != sessions_.cend() && session->second.id == session_id ? session->second.acquire_count.load() : 0; } diff --git a/hazelcast/test/src/HazelcastTests1.cpp b/hazelcast/test/src/HazelcastTests1.cpp index 0efe5f9ea2..41ba0909f0 100644 --- a/hazelcast/test/src/HazelcastTests1.cpp +++ b/hazelcast/test/src/HazelcastTests1.cpp @@ -1333,8 +1333,8 @@ TEST_F(ClientConnectionTest, testExcludedCipher) auto newCiphers = get_ciphers(std::move(config)); for (std::vector::const_iterator it = newCiphers.begin(); - it != newCiphers.end(); + CipherInfo>::const_iterator it = newCiphers.cbegin(); + it != newCiphers.cend(); ++it) { ASSERT_NE(unsupportedCipher, it->name) << ", expected ciphers list lis:" << supportedCiphers.size() @@ -1975,7 +1975,7 @@ TEST_F(PnCounterFunctionalityTest, testParallelism) })); } - boost::wait_for_all(futures.begin(), futures.end()); + boost::wait_for_all(futures.cbegin(), futures.cend()); int64_t finalExpectedValue = 3 * (int64_t)loopsPerThread * parallelism; ASSERT_EQ_EVENTUALLY(finalExpectedValue, counter1->get().get()); @@ -2399,7 +2399,7 @@ TEST_F(FlakeIdGeneratorApiTest, testSmoke) std::unordered_set allIds; for (auto& f : futures) { auto ids = f.get(); - allIds.insert(ids.begin(), ids.end()); + allIds.insert(ids.cbegin(), ids.cend()); } // if there were duplicate IDs generated, there will be less items in the @@ -3361,7 +3361,7 @@ TEST_F(ClientTxnMultiMapTest, testPutGetRemove) }); } - boost::wait_for_all(futures.begin(), futures.end()); + boost::wait_for_all(futures.cbegin(), futures.cend()); } TEST_F(ClientTxnMultiMapTest, testServiceNameAndDestroy) @@ -3582,7 +3582,7 @@ TEST_F(DataInputTest, testReadByteArray) { std::vector bytes{ 0x00, 0x00, 0x00, 0x02 }; std::vector actualDataBytes{ 0x12, 0x34 }; - bytes.insert(bytes.end(), actualDataBytes.begin(), actualDataBytes.end()); + bytes.insert(bytes.cend(), actualDataBytes.cbegin(), actualDataBytes.cend()); serialization::pimpl::data_input> dataInput( boost::endian::order::big, bytes); auto readBytes = dataInput.read>(); @@ -3837,7 +3837,7 @@ TEST_F(DataOutputTest, testWriteByteArray) { std::vector bytes{ 0x00, 0x00, 0x00, 0x02 }; std::vector actualDataBytes{ 0x12, 0x34 }; - bytes.insert(bytes.end(), actualDataBytes.begin(), actualDataBytes.end()); + bytes.insert(bytes.cend(), actualDataBytes.cbegin(), actualDataBytes.cend()); serialization::pimpl::data_output dataOutput(boost::endian::order::big); dataOutput.write(&actualDataBytes); ASSERT_EQ(bytes, dataOutput.to_byte_array()); diff --git a/hazelcast/test/src/HazelcastTests2.cpp b/hazelcast/test/src/HazelcastTests2.cpp index e6dae20a6c..4fcc0cad62 100644 --- a/hazelcast/test/src/HazelcastTests2.cpp +++ b/hazelcast/test/src/HazelcastTests2.cpp @@ -156,10 +156,10 @@ TEST_F(AddressHelperTest, testGetPossibleSocketAddresses) util::AddressHelper::get_socket_addresses(addr, get_logger()); ASSERT_EQ(3U, addresses.size()); std::unordered_set
socketAddresses; - socketAddresses.insert(addresses.begin(), addresses.end()); - ASSERT_NE(socketAddresses.end(), socketAddresses.find(address(addr, 5701))); - ASSERT_NE(socketAddresses.end(), socketAddresses.find(address(addr, 5702))); - ASSERT_NE(socketAddresses.end(), socketAddresses.find(address(addr, 5703))); + socketAddresses.insert(addresses.cbegin(), addresses.cend()); + ASSERT_NE(socketAddresses.cend(), socketAddresses.find(address(addr, 5701))); + ASSERT_NE(socketAddresses.cend(), socketAddresses.find(address(addr, 5702))); + ASSERT_NE(socketAddresses.cend(), socketAddresses.find(address(addr, 5703))); } TEST_F(AddressHelperTest, testAddressHolder) @@ -302,8 +302,8 @@ TEST_F(ClientConfigTest, testAddresseses) auto configuredAddresses = clientConfig.get_network_config().get_addresses(); ASSERT_EQ(2U, addresses.size()); - std::vector
configuredAddressVector(configuredAddresses.begin(), - configuredAddresses.end()); + std::vector
configuredAddressVector(configuredAddresses.cbegin(), + configuredAddresses.cend()); std::sort(configuredAddressVector.begin(), configuredAddressVector.end()); ASSERT_EQ(addresses, configuredAddressVector); } @@ -396,9 +396,9 @@ TEST_F(ClientConfigTest, test_add_label) config.add_label(label); auto& labels = config.get_labels(); EXPECT_EQ(1, labels.size()); - is_found = labels.find(label) != labels.end(); + is_found = labels.find(label) != labels.cend(); EXPECT_TRUE(is_found); - is_found = labels.find(non_existing_label) != labels.end(); + is_found = labels.find(non_existing_label) != labels.cend(); EXPECT_FALSE(is_found); } @@ -416,11 +416,11 @@ TEST_F(ClientConfigTest, test_set_label) auto& labels = config.get_labels(); EXPECT_EQ(2, labels.size()); - is_found = labels.find(label_1) != labels.end(); + is_found = labels.find(label_1) != labels.cend(); EXPECT_TRUE(is_found); - is_found = labels.find(label_2) != labels.end(); + is_found = labels.find(label_2) != labels.cend(); EXPECT_TRUE(is_found); - is_found = labels.find(non_existing_label) != labels.end(); + is_found = labels.find(non_existing_label) != labels.cend(); EXPECT_FALSE(is_found); } diff --git a/hazelcast/test/src/HazelcastTests3.cpp b/hazelcast/test/src/HazelcastTests3.cpp index 052b73e182..fc3d2cee62 100644 --- a/hazelcast/test/src/HazelcastTests3.cpp +++ b/hazelcast/test/src/HazelcastTests3.cpp @@ -165,7 +165,7 @@ class ClientReplicatedMapTestBase : public ClientTest template bool contains(std::vector& values, const T& value) { - return std::find(values.begin(), values.end(), value) != values.end(); + return std::find(values.cbegin(), values.cend(), value) != values.cend(); } static TEST_VALUES_TYPE build_test_values() diff --git a/hazelcast/test/src/HazelcastTests5.cpp b/hazelcast/test/src/HazelcastTests5.cpp index d32faa4d4a..2b14cc5105 100644 --- a/hazelcast/test/src/HazelcastTests5.cpp +++ b/hazelcast/test/src/HazelcastTests5.cpp @@ -3569,9 +3569,9 @@ TEST_P(ClientMapTest, testExecuteOnKeys) .get(); ASSERT_EQ(3, (int)result.size()); - ASSERT_NE(result.end(), result.find(3)); - ASSERT_NE(result.end(), result.find(5)); - ASSERT_NE(result.end(), result.find(999)); + ASSERT_NE(result.cend(), result.find(3)); + ASSERT_NE(result.cend(), result.find(5)); + ASSERT_NE(result.cend(), result.find(999)); ASSERT_EQ(3 * processor.get_multiplier(), result[3].value()); ASSERT_EQ(5 * processor.get_multiplier(), result[5].value()); ASSERT_EQ(-1, result[999].value()); @@ -3594,9 +3594,9 @@ TEST_P(ClientMapTest, testExecuteOnEntries) .get(); ASSERT_EQ(3, (int)result.size()); - ASSERT_TRUE((result.end() != result.find(3))); - ASSERT_TRUE((result.end() != result.find(4))); - ASSERT_TRUE((result.end() != result.find(5))); + ASSERT_TRUE((result.cend() != result.find(3))); + ASSERT_TRUE((result.cend() != result.find(4))); + ASSERT_TRUE((result.cend() != result.find(5))); ASSERT_EQ(3 * processor.get_multiplier(), result[3].value()); ASSERT_EQ(4 * processor.get_multiplier(), result[4].value()); ASSERT_EQ(5 * processor.get_multiplier(), result[5].value()); @@ -3621,9 +3621,9 @@ TEST_P(ClientMapTest, testExecuteOnEntriesWithtrue_predicate) .get(); ASSERT_EQ(3, (int)result.size()); - ASSERT_TRUE((result.end() != result.find(3))); - ASSERT_TRUE((result.end() != result.find(4))); - ASSERT_TRUE((result.end() != result.find(5))); + ASSERT_TRUE((result.cend() != result.find(3))); + ASSERT_TRUE((result.cend() != result.find(4))); + ASSERT_TRUE((result.cend() != result.find(5))); ASSERT_EQ(3 * processor.get_multiplier(), result[3].value()); ASSERT_EQ(4 * processor.get_multiplier(), result[4].value()); ASSERT_EQ(5 * processor.get_multiplier(), result[5].value()); @@ -3674,7 +3674,7 @@ TEST_P(ClientMapTest, testExecuteOnEntriesWithand_predicate) .get(); ASSERT_EQ(1, (int)result.size()); - ASSERT_TRUE((result.end() != result.find(5))); + ASSERT_TRUE((result.cend() != result.find(5))); ASSERT_EQ(5 * processor.get_multiplier(), result[5].value()); } @@ -3702,8 +3702,8 @@ TEST_P(ClientMapTest, testExecuteOnEntriesWithor_predicate) .get(); ASSERT_EQ(2, (int)result.size()); - ASSERT_TRUE((result.end() != result.find(3))); - ASSERT_TRUE((result.end() != result.find(4))); + ASSERT_TRUE((result.cend() != result.find(3))); + ASSERT_TRUE((result.cend() != result.find(4))); ASSERT_EQ(3 * processor.get_multiplier(), result[3].value()); ASSERT_EQ(4 * processor.get_multiplier(), result[4].value()); } @@ -3727,8 +3727,8 @@ TEST_P(ClientMapTest, testExecuteOnEntriesWithbetween_predicate) .get(); ASSERT_EQ(2, (int)result.size()); - ASSERT_TRUE((result.end() != result.find(3))); - ASSERT_TRUE((result.end() != result.find(5))); + ASSERT_TRUE((result.cend() != result.find(3))); + ASSERT_TRUE((result.cend() != result.find(5))); ASSERT_EQ(3 * processor.get_multiplier(), result[3].value()); ASSERT_EQ(5 * processor.get_multiplier(), result[5].value()); } @@ -3752,7 +3752,7 @@ TEST_P(ClientMapTest, testExecuteOnEntriesWithequal_predicate) .get(); ASSERT_EQ(1, (int)result.size()); - ASSERT_TRUE((result.end() != result.find(5))); + ASSERT_TRUE((result.cend() != result.find(5))); result = employees_ ->execute_on_entries( @@ -3781,8 +3781,8 @@ TEST_P(ClientMapTest, testExecuteOnEntriesWithnot_equal_predicate) .get(); ASSERT_EQ(2, (int)result.size()); - ASSERT_TRUE((result.end() != result.find(3))); - ASSERT_TRUE((result.end() != result.find(4))); + ASSERT_TRUE((result.cend() != result.find(3))); + ASSERT_TRUE((result.cend() != result.find(4))); } TEST_P(ClientMapTest, testExecuteOnEntriesWithgreater_less_predicate) @@ -3805,7 +3805,7 @@ TEST_P(ClientMapTest, testExecuteOnEntriesWithgreater_less_predicate) .get(); // <25 matching ASSERT_EQ(1, (int)result.size()); - ASSERT_TRUE((result.end() != result.find(4))); + ASSERT_TRUE((result.cend() != result.find(4))); result = employees_ ->execute_on_entries( @@ -3814,8 +3814,8 @@ TEST_P(ClientMapTest, testExecuteOnEntriesWithgreater_less_predicate) .get(); // <=25 matching ASSERT_EQ(2, (int)result.size()); - ASSERT_TRUE((result.end() != result.find(4))); - ASSERT_TRUE((result.end() != result.find(5))); + ASSERT_TRUE((result.cend() != result.find(4))); + ASSERT_TRUE((result.cend() != result.find(5))); result = employees_ ->execute_on_entries( @@ -3824,7 +3824,7 @@ TEST_P(ClientMapTest, testExecuteOnEntriesWithgreater_less_predicate) .get(); // >25 matching ASSERT_EQ(1, (int)result.size()); - ASSERT_TRUE((result.end() != result.find(3))); + ASSERT_TRUE((result.cend() != result.find(3))); result = employees_ ->execute_on_entries( @@ -3833,8 +3833,8 @@ TEST_P(ClientMapTest, testExecuteOnEntriesWithgreater_less_predicate) .get(); // >=25 matching ASSERT_EQ(2, (int)result.size()); - ASSERT_TRUE((result.end() != result.find(3))); - ASSERT_TRUE((result.end() != result.find(5))); + ASSERT_TRUE((result.cend() != result.find(3))); + ASSERT_TRUE((result.cend() != result.find(5))); } TEST_P(ClientMapTest, testExecuteOnEntriesWithlike_predicate) @@ -3856,7 +3856,7 @@ TEST_P(ClientMapTest, testExecuteOnEntriesWithlike_predicate) .get(); ASSERT_EQ(1, (int)result.size()); - ASSERT_TRUE((result.end() != result.find(5))); + ASSERT_TRUE((result.cend() != result.find(5))); } TEST_P(ClientMapTest, testExecuteOnEntriesWithilike_predicate) @@ -3878,7 +3878,7 @@ TEST_P(ClientMapTest, testExecuteOnEntriesWithilike_predicate) .get(); ASSERT_EQ(1, (int)result.size()); - ASSERT_TRUE((result.end() != result.find(5))); + ASSERT_TRUE((result.cend() != result.find(5))); } TEST_P(ClientMapTest, testExecuteOnEntriesWithin_predicate) @@ -3900,8 +3900,8 @@ TEST_P(ClientMapTest, testExecuteOnEntriesWithin_predicate) .get(); ASSERT_EQ(2, (int)result.size()); - ASSERT_TRUE((result.end() != result.find(3))); - ASSERT_TRUE((result.end() != result.find(4))); + ASSERT_TRUE((result.cend() != result.find(3))); + ASSERT_TRUE((result.cend() != result.find(4))); } TEST_P(ClientMapTest, testExecuteOnEntriesWithinstance_of_predicate) @@ -3924,9 +3924,9 @@ TEST_P(ClientMapTest, testExecuteOnEntriesWithinstance_of_predicate) .get(); ASSERT_EQ(3, (int)result.size()); - ASSERT_TRUE((result.end() != result.find(3))); - ASSERT_TRUE((result.end() != result.find(4))); - ASSERT_TRUE((result.end() != result.find(5))); + ASSERT_TRUE((result.cend() != result.find(3))); + ASSERT_TRUE((result.cend() != result.find(4))); + ASSERT_TRUE((result.cend() != result.find(5))); } TEST_P(ClientMapTest, testExecuteOnEntriesWithnot_predicate) @@ -3948,8 +3948,8 @@ TEST_P(ClientMapTest, testExecuteOnEntriesWithnot_predicate) .get(); ASSERT_EQ(2, (int)result.size()); - ASSERT_TRUE((result.end() != result.find(3))); - ASSERT_TRUE((result.end() != result.find(4))); + ASSERT_TRUE((result.cend() != result.find(3))); + ASSERT_TRUE((result.cend() != result.find(4))); query::not_predicate notfalse_predicate(client_, query::false_predicate(client_)); @@ -3959,9 +3959,9 @@ TEST_P(ClientMapTest, testExecuteOnEntriesWithnot_predicate) .get(); ASSERT_EQ(3, (int)result.size()); - ASSERT_TRUE((result.end() != result.find(3))); - ASSERT_TRUE((result.end() != result.find(4))); - ASSERT_TRUE((result.end() != result.find(5))); + ASSERT_TRUE((result.cend() != result.find(3))); + ASSERT_TRUE((result.cend() != result.find(4))); + ASSERT_TRUE((result.cend() != result.find(5))); query::not_predicate notbetween_predicate( client_, query::between_predicate(client_, "a", 25, 35)); @@ -3971,7 +3971,7 @@ TEST_P(ClientMapTest, testExecuteOnEntriesWithnot_predicate) .get(); ASSERT_EQ(1, (int)result.size()); - ASSERT_TRUE((result.end() != result.find(4))); + ASSERT_TRUE((result.cend() != result.find(4))); } TEST_P(ClientMapTest, testExecuteOnEntriesWithregex_predicate) @@ -3993,8 +3993,8 @@ TEST_P(ClientMapTest, testExecuteOnEntriesWithregex_predicate) .get(); ASSERT_EQ(2, (int)result.size()); - ASSERT_TRUE((result.end() != result.find(3))); - ASSERT_TRUE((result.end() != result.find(4))); + ASSERT_TRUE((result.cend() != result.find(3))); + ASSERT_TRUE((result.cend() != result.find(4))); } TEST_P(ClientMapTest, testAddInterceptor) diff --git a/hazelcast/test/src/HazelcastTests7.cpp b/hazelcast/test/src/HazelcastTests7.cpp index 281a04f5dd..5f4e805c5f 100644 --- a/hazelcast/test/src/HazelcastTests7.cpp +++ b/hazelcast/test/src/HazelcastTests7.cpp @@ -1190,7 +1190,7 @@ TEST_F(ClientExecutorServiceTest, testSubmitCallableToMembers) for (const member& member : members) { ASSERT_EQ(1U, futuresMap.count(member)); auto it = futuresMap.find(member); - ASSERT_NE(futuresMap.end(), it); + ASSERT_NE(futuresMap.cend(), it); auto uuid = (*it).second.get_future().get(); ASSERT_TRUE(uuid); ASSERT_EQ(member.get_uuid(), uuid); @@ -1410,7 +1410,7 @@ TEST_F(ClientExecutorServiceTest, testExecuteOnMembers) auto map = client->get_map(testName).get(); std::vector allMembers = client->get_cluster().get_members(); - std::vector members(allMembers.begin(), allMembers.begin() + 2); + std::vector members(allMembers.cbegin(), allMembers.cbegin() + 2); executor::tasks::MapPutPartitionAwareCallable callable( testName, "key"); @@ -1750,7 +1750,7 @@ TEST_F(DescribeInstancesTest, testDescribeInstancesTagAndValueSet) get_logger()); std::unordered_map results = desc.execute(); ASSERT_EQ(results.size(), 1U); - ASSERT_NE(results.end(), + ASSERT_NE(results.cend(), results.find(getenv("HZ_TEST_AWS_INSTANCE_PRIVATE_IP"))); } @@ -1785,7 +1785,7 @@ TEST_F(DescribeInstancesTest, testDescribeInstancesOnlyTagIsSet) get_logger()); std::unordered_map results = desc.execute(); ASSERT_EQ(results.size(), 1U); - ASSERT_NE(results.end(), + ASSERT_NE(results.cend(), results.find(getenv("HZ_TEST_AWS_INSTANCE_PRIVATE_IP"))); } @@ -1819,7 +1819,7 @@ TEST_F(DescribeInstancesTest, testDescribeInstancesOnlyValueIsSet) get_logger()); std::unordered_map results = desc.execute(); ASSERT_EQ(results.size(), 1U); - ASSERT_NE(results.end(), + ASSERT_NE(results.cend(), results.find(getenv("HZ_TEST_AWS_INSTANCE_PRIVATE_IP"))); } @@ -1854,7 +1854,7 @@ TEST_F(DescribeInstancesTest, testDescribeInstancesSecurityGroup) get_logger()); std::unordered_map results = desc.execute(); ASSERT_EQ(results.size(), 1U); - ASSERT_NE(results.end(), + ASSERT_NE(results.cend(), results.find(getenv("HZ_TEST_AWS_INSTANCE_PRIVATE_IP"))); } @@ -1890,13 +1890,13 @@ TEST_F(CloudUtilityTest, testUnmarshallResponseXml) hazelcast::client::aws::utility::cloud_utility::unmarshal_the_response( responseStream, get_logger()); ASSERT_EQ(4U, results.size()); - ASSERT_NE(results.end(), results.find("10.0.16.13")); + ASSERT_NE(results.cend(), results.find("10.0.16.13")); ASSERT_EQ("", results["10.0.16.13"]); - ASSERT_NE(results.end(), results.find("10.0.16.17")); + ASSERT_NE(results.cend(), results.find("10.0.16.17")); ASSERT_EQ("54.85.192.215", results["10.0.16.17"]); - ASSERT_NE(results.end(), results.find("10.0.16.25")); + ASSERT_NE(results.cend(), results.find("10.0.16.25")); ASSERT_EQ("", results["10.0.16.25"]); - ASSERT_NE(results.end(), results.find("172.30.4.118")); + ASSERT_NE(results.cend(), results.find("172.30.4.118")); ASSERT_EQ("54.85.192.213", results["172.30.4.118"]); } @@ -1910,7 +1910,7 @@ class cloud_discovery_test : public ClientTest int port) { auto found = addresses.find(address{ private_ip, port }); - ASSERT_NE(addresses.end(), found); + ASSERT_NE(addresses.cend(), found); ASSERT_EQ((address{ public_ip, port }), found->second); } }; diff --git a/hazelcast/test/src/HazelcastTests8.cpp b/hazelcast/test/src/HazelcastTests8.cpp index 094e45cdb0..8b5278921c 100644 --- a/hazelcast/test/src/HazelcastTests8.cpp +++ b/hazelcast/test/src/HazelcastTests8.cpp @@ -982,8 +982,8 @@ class ClientSetTest : public ClientTest const std::string& item) const { bool found = false; - for (std::vector::const_iterator it = items.begin(); - it != items.end(); + for (std::vector::const_iterator it = items.cbegin(); + it != items.cend(); ++it) { if (item == *it) { found = true; @@ -2344,7 +2344,7 @@ TEST(ClientMessageTest, test_encode_sql_query_id) std::vector actual_bytes; for (const auto& piece : msg.get_buffer()) { - actual_bytes.insert(actual_bytes.end(), piece.begin(), piece.end()); + actual_bytes.insert(actual_bytes.cend(), piece.cbegin(), piece.cend()); } EXPECT_EQ(expected_bytes, actual_bytes); diff --git a/hazelcast/test/src/metrics_test.cpp b/hazelcast/test/src/metrics_test.cpp index de9c5b5ba7..b8dabee0bf 100644 --- a/hazelcast/test/src/metrics_test.cpp +++ b/hazelcast/test/src/metrics_test.cpp @@ -72,7 +72,7 @@ TEST(metrics_dictionary_test, test_begin_end) using item = std::pair; - auto actual_items = std::vector{ dict.begin(), dict.end() }; + auto actual_items = std::vector{ dict.cbegin(), dict.cend() }; auto expected_items = std::vector{ { "bar", 1 }, { "foo", 0 } }; ASSERT_EQ(expected_items, actual_items); diff --git a/hazelcast/test/src/sql_test.cpp b/hazelcast/test/src/sql_test.cpp index d04bd09881..d5fcd52642 100644 --- a/hazelcast/test/src/sql_test.cpp +++ b/hazelcast/test/src/sql_test.cpp @@ -669,7 +669,7 @@ class SqlTest auto field_type = column_types[i]; auto it = row_metadata.find_column(field); - ASSERT_NE(row_metadata.end(), it); + ASSERT_NE(row_metadata.cend(), it); auto const& column_meta_data = row_metadata.column(it->second); ASSERT_EQ(field, column_meta_data.name); @@ -688,7 +688,7 @@ class SqlTest const std::string& column_name) { auto column_index = row.row_metadata().find_column(column_name); - ASSERT_NE(row.row_metadata().end(), column_index); + ASSERT_NE(row.row_metadata().cend(), column_index); ASSERT_EQ(expected_type, row.row_metadata().column(column_index->second).type); @@ -1224,8 +1224,8 @@ TEST_P(SqlTest, test_execute_statement_with_params) .str() }; - auto height_param = expecteds.begin()->second.height; - auto age_param = (++expecteds.begin())->second.age; + auto height_param = expecteds.cbegin()->second.height; + auto age_param = (++expecteds.cbegin())->second.age; statement.set_parameters(height_param, age_param); @@ -1271,8 +1271,8 @@ TEST_F(SqlTest, test_execute_statement_with_params_after_clear_parameters) .str() }; - auto height_param = expecteds.begin()->second.height; - auto age_param = (++expecteds.begin())->second.age; + auto height_param = expecteds.cbegin()->second.height; + auto age_param = (++expecteds.cbegin())->second.age; statement.set_parameters(height_param); statement.clear_parameters(); @@ -2333,7 +2333,7 @@ TEST_F(sql_encode_test, execute) std::vector actual_bytes = {}; for (auto buf : msg.get_buffer()) { - actual_bytes.insert(actual_bytes.end(), buf.begin(), buf.end()); + actual_bytes.insert(actual_bytes.cend(), buf.cbegin(), buf.cend()); } for (auto b : actual_bytes) { @@ -2354,7 +2354,7 @@ TEST_F(sql_encode_test, fetch) std::vector actual_bytes = {}; for (auto buf : msg.get_buffer()) { - actual_bytes.insert(actual_bytes.end(), buf.begin(), buf.end()); + actual_bytes.insert(actual_bytes.cend(), buf.cbegin(), buf.cend()); } std::vector expected_bytes = { @@ -2381,7 +2381,7 @@ TEST_F(sql_encode_test, close) std::vector actual_bytes = {}; for (auto buf : msg.get_buffer()) { - actual_bytes.insert(actual_bytes.end(), buf.begin(), buf.end()); + actual_bytes.insert(actual_bytes.cend(), buf.cbegin(), buf.cend()); } std::vector