Merge branch 'checkerConst.SGTools-20211123' into 'master'

SGTools: Update for thread-safety checker const changes.

See merge request atlas/athena!48464

Control/SGTools/SGTools/DataProxy.h

@@ -250,7 +250,7 @@ class DataStore;
      *
      * Returns a null pointer on failure.
      */
-    std::unique_ptr<DataObject> readData() const;
+    std::unique_ptr<DataObject> readData();
 
 
   private:
@@ -368,7 +368,7 @@ class DataStore;
      * This will fail if the proxy does not refer to an object read from an
      * input file.
      */
-    std::unique_ptr<DataObject> readData (objLock_t& objLock, ErrNo* errNo) const;
+    std::unique_ptr<DataObject> readData (objLock_t& objLock, ErrNo* errNo);
 
 
     /// set DataObject

Control/SGTools/src/DataProxy.cxx

@@ -427,7 +427,7 @@ void DataProxy::setAddress(IOpaqueAddress* address)
  *
  * Returns a null pointer on failure.
  */
-std::unique_ptr<DataObject> DataProxy::readData() const
+std::unique_ptr<DataObject> DataProxy::readData()
 {
   // Public wrapper for readData().
   objLock_t objLock (m_objMutex);
@@ -446,7 +446,7 @@ std::unique_ptr<DataObject> DataProxy::readData() const
  * This will fail if the proxy does not refer to an object read from an
  * input file.
  */
-std::unique_ptr<DataObject> DataProxy::readData (objLock_t&, ErrNo* errNo) const
+std::unique_ptr<DataObject> DataProxy::readData (objLock_t&, ErrNo* errNo)
 {
   if (errNo) *errNo = ALLOK;
 

Control/SGTools/src/DataStore.cxx

@@ -447,7 +447,10 @@ DataProxy* DataStore::proxy_exact(sgkey_t sgkey) const
 DataProxy* DataStore::proxy_exact(const CLID& id,
                                   const std::string& key) const
 {
-  return proxy_exact (m_pool.stringToKey (key, id));
+  // Suppress warning here about calling to a nonconst method
+  // of m_pool.  Ok since all callers here must own the store lock.
+  IProxyDict& pool_nc ATLAS_THREAD_SAFE = m_pool;
+  return proxy_exact (pool_nc.stringToKey (key, id));
 }