Commit 5082c255 authored by Mukund Sivaraman's avatar Mukund Sivaraman
Browse files

[2850] Constify getNamedAddress()

parent 3599c074
......@@ -254,7 +254,7 @@ public:
/// \return An std::pair containing a bool (set to true if the name
/// was found, or false otherwise) and the address associated with
/// the name (which is undefined if the name was not found).
NamedAddressResult getNamedAddress(const char* name) {
NamedAddressResult getNamedAddress(const char* name) const {
// This public method implements common validation. The actual
// work specific to the derived segment is delegated to the
// corresponding protected method.
......@@ -296,7 +296,7 @@ protected:
virtual bool setNamedAddressImpl(const char* name, void* addr) = 0;
/// \brief Implementation of getNamedAddress beyond common validation.
virtual NamedAddressResult getNamedAddressImpl(const char* name) = 0;
virtual NamedAddressResult getNamedAddressImpl(const char* name) const = 0;
/// \brief Implementation of clearNamedAddress beyond common validation.
virtual bool clearNamedAddressImpl(const char* name) = 0;
......
......@@ -52,8 +52,9 @@ MemorySegmentLocal::allMemoryDeallocated() const {
}
MemorySegment::NamedAddressResult
MemorySegmentLocal::getNamedAddressImpl(const char* name) {
std::map<std::string, void*>::iterator found = named_addrs_.find(name);
MemorySegmentLocal::getNamedAddressImpl(const char* name) const {
std::map<std::string, void*>::const_iterator found =
named_addrs_.find(name);
if (found != named_addrs_.end()) {
return (NamedAddressResult(true, found->second));
}
......
......@@ -70,7 +70,7 @@ public:
///
/// There's a small chance this method could throw std::bad_alloc.
/// It should be considered a fatal error.
virtual NamedAddressResult getNamedAddressImpl(const char* name);
virtual NamedAddressResult getNamedAddressImpl(const char* name) const;
/// \brief Local segment version of setNamedAddress.
///
......
......@@ -280,7 +280,7 @@ MemorySegmentMapped::allMemoryDeallocated() const {
}
MemorySegment::NamedAddressResult
MemorySegmentMapped::getNamedAddressImpl(const char* name) {
MemorySegmentMapped::getNamedAddressImpl(const char* name) const {
offset_ptr<void>* storage =
impl_->base_sgmt_->find<offset_ptr<void> >(name).first;
if (storage) {
......
......@@ -195,7 +195,7 @@ public:
/// \brief Mapped segment version of getNamedAddress.
///
/// This version never throws.
virtual NamedAddressResult getNamedAddressImpl(const char* name);
virtual NamedAddressResult getNamedAddressImpl(const char* name) const;
/// \brief Mapped segment version of clearNamedAddress.
///
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment