Merge branch 'proxydict' into 'main'

IProxyDict+AthViews: use modern interface declaration

See merge request !74850

Control/AthViews/AthViews/DebugView.h

 ///////////////////////// -*- C++ -*- /////////////////////////////
 
 /*
-  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef ATHVIEWS_DEBUGVIEW_H
@@ -28,7 +28,6 @@ class DataObject;
 class DebugView : public SimpleView, AthMessaging
 {
   public:
-    DeclareInterfaceID( DebugView, 2, 0 );
 
     DebugView() = delete;
     DebugView( std::string const& Name, bool AllowFallThrough = true, std::string const& storeName = "StoreGateSvc" );

Control/AthViews/AthViews/SimpleView.h

 ///////////////////////// -*- C++ -*- /////////////////////////////
 
 /*
-  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef ATHVIEWS_SIMPLEVIEW_H
@@ -31,10 +31,9 @@ class DataObject;
  *
  * @author Ben Wynne - ATLAS
  */
-class SimpleView : public IProxyDict
+class SimpleView : public implements<IProxyDict>
 {
   public:
-    DeclareInterfaceID( SimpleView, 2, 0 );
 
     SimpleView() = delete;
     SimpleView( std::string const& Name, bool AllowFallThrough = true, std::string const& storeName = "StoreGateSvc" );
@@ -172,9 +171,6 @@ class SimpleView : public IProxyDict
     virtual bool tryELRemap ( sgkey_t sgkey_in,   size_t index_in,
                               sgkey_t& sgkey_out, size_t& index_out);
 
-    virtual unsigned long addRef();
-    virtual unsigned long release();
-    virtual StatusCode queryInterface( const InterfaceID &ti, void** pp );
     virtual const std::string& name() const;
 
     //IStringPool

Control/AthViews/src/SimpleView.cxx

 /*
-  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 */
 
 #include <stdexcept>
@@ -201,21 +201,6 @@ void SimpleView::unboundHandle( IResetable * handle )
   return m_store->unboundHandle( handle );
 }
 
-unsigned long SimpleView::addRef()
-{
-  throw std::runtime_error( "Not implemented: SimpleView::addRef" );
-  return 0;
-}
-unsigned long SimpleView::release()
-{
-  throw std::runtime_error( "Not implemented: SimpleView::release" );
-  return 0;
-}
-StatusCode SimpleView::queryInterface( const InterfaceID &/*ti*/, void** /*pp*/ )
-{
-  throw std::runtime_error( "Not implemented: SimpleView::queryInterface" );
-  return StatusCode::FAILURE;
-}
 const std::string& SimpleView::name() const
 {
   return m_name;

Control/AthenaKernel/AthenaKernel/IProxyDict.h

 ///////////////////////// -*- C++ -*- /////////////////////////////
 
 /*
-  Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef ATHENAKERNEL_IPROXYDICT_H
@@ -40,14 +40,10 @@ class IConverter;
  * data.  This interface also provides methods for converting between
  * the two representations.
  *
- * 
  * @author Paolo Calafiura - ATLAS
- *  $Id: IProxyDict.h,v 1.5 2007-12-11 02:56:22 binet Exp $
  */
-class IProxyDict : virtual public IStringPool,
-                   virtual public IHiveStore,
-                   virtual public INamedInterface
-
+class IProxyDict : virtual public IStringPool,  // not a Gaudi interface
+                   virtual public extend_interfaces<IHiveStore, INamedInterface>
 {
 public:
   DeclareInterfaceID (IProxyDict, 2, 0);