Merge branch 'master-DataModelTestDataCommon' into 'master'

Fixed compilation problem of DataModelTestDataCommon/CondAlg2

See merge request atlas/athena!16793

Control/DataModelTest/DataModelTestDataCommon/src/CondAlg2.cxx

@@ -49,7 +49,7 @@ StatusCode CondAlg2::initialize()
 /**
  * @brief Algorithm event processing.
  */
-StatusCode CondAlg2::execute_r (const EventContext& ctx) const
+StatusCode CondAlg2::execute (const EventContext& ctx) const
 {
   SG::ReadCondHandle<AthenaAttributeList> rltest (m_rltestKey, ctx);
   int xint_rl = (**rltest)["xint"].data<int>();

Control/DataModelTest/DataModelTestDataCommon/src/CondAlg2.h

@@ -47,7 +47,7 @@ public:
   /**
    * @brief Algorithm event processing.
    */
-  virtual StatusCode execute_r (const EventContext& ctx) const override;
+  virtual StatusCode execute (const EventContext& ctx) const override;
 
 
 private: