From 2259fd845c8167e08bc7e8ff22cabcb4079daf49 Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Wed, 25 Sep 2019 13:30:25 +0200 Subject: [PATCH] STYLE: add const_cast when deleting pointers in objectRegistry - makes the intention clearer, allows for future tightening of iterator access rules. --- src/OpenFOAM/db/objectRegistry/objectRegistry.C | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/OpenFOAM/db/objectRegistry/objectRegistry.C b/src/OpenFOAM/db/objectRegistry/objectRegistry.C index fe9cdb2a9e..2cd83ee4fd 100644 --- a/src/OpenFOAM/db/objectRegistry/objectRegistry.C +++ b/src/OpenFOAM/db/objectRegistry/objectRegistry.C @@ -370,7 +370,7 @@ bool Foam::objectRegistry::erase(const iterator& iter) if (iter.found()) { - regIOobject* ptr = iter.val(); + regIOobject* ptr = const_cast(iter).val(); const bool ok = HashTable::erase(iter); @@ -395,7 +395,7 @@ bool Foam::objectRegistry::erase(const word& key) Foam::label Foam::objectRegistry::erase(std::initializer_list keys) { - return eraseImpl(*this, keys.begin(), keys.end()); + return eraseImpl(*this, keys.begin(), keys.end()); }