diff --git a/MuonSpectrometer/MuonGMdbObjects/src/DblQ00Acut.cxx b/MuonSpectrometer/MuonGMdbObjects/src/DblQ00Acut.cxx
index ecb03bc473218dad3ed9b24f5a64578b28aab467..0856c07ab2e4dc847f03315cef89da75c73794fa 100644
--- a/MuonSpectrometer/MuonGMdbObjects/src/DblQ00Acut.cxx
+++ b/MuonSpectrometer/MuonGMdbObjects/src/DblQ00Acut.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
 
 /***************************************************************************
@@ -65,7 +65,7 @@ DblQ00Acut::DblQ00Acut(AmdcDb* acut) :
 
   int i = -1;
   it = pIRDBRecordset->begin();
-  for( ; it<pIRDBRecordset->end(); it++){
+  for( ; it<pIRDBRecordset->end(); ++it){
      pAmdcDbRecord = dynamic_cast<const AmdcDbRecord*>((*it));
      if(pAmdcDbRecord == 0){
        std::cerr << "No way to cast in AmdcDbRecord for " << getObjName() << std::endl;
diff --git a/MuonSpectrometer/MuonGMdbObjects/src/DblQ00Alin.cxx b/MuonSpectrometer/MuonGMdbObjects/src/DblQ00Alin.cxx
index c4361ead96779045e2f62686db1ed283a040a0b6..284ee4afb60d6d8a0a8a50167f9203aad6a57fdc 100644
--- a/MuonSpectrometer/MuonGMdbObjects/src/DblQ00Alin.cxx
+++ b/MuonSpectrometer/MuonGMdbObjects/src/DblQ00Alin.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
 
 /***************************************************************************
@@ -87,7 +87,7 @@ DblQ00Alin::DblQ00Alin(AmdcDb* alin) :
 
   int i = -1;
   it = pIRDBRecordset->begin();
-  for( ; it<pIRDBRecordset->end(); it++){
+  for( ; it<pIRDBRecordset->end(); ++it){
      pAmdcDbRecord = dynamic_cast<const AmdcDbRecord*>((*it));
      if(pAmdcDbRecord == 0){
        std::cerr << "No way to cast in AmdcDbRecord for " << getObjName() << std::endl;
diff --git a/MuonSpectrometer/MuonGMdbObjects/src/DblQ00Almn.cxx b/MuonSpectrometer/MuonGMdbObjects/src/DblQ00Almn.cxx
index 4ab2802195a6004f46ac3377596ea062e9c0dd23..dd119c66c0847c965c8f379c9e9220b292df290e 100644
--- a/MuonSpectrometer/MuonGMdbObjects/src/DblQ00Almn.cxx
+++ b/MuonSpectrometer/MuonGMdbObjects/src/DblQ00Almn.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
 
 /***************************************************************************
@@ -103,7 +103,7 @@ DblQ00Almn::DblQ00Almn(AmdcDb* almn) :
 
   int i = -1;
   it = pIRDBRecordset->begin();
-  for( ; it<pIRDBRecordset->end(); it++){
+  for( ; it<pIRDBRecordset->end(); ++it){
      pAmdcDbRecord = dynamic_cast<const AmdcDbRecord*>((*it));
      if(pAmdcDbRecord == 0){
        std::cerr << "No way to cast in AmdcDbRecord for " << getObjName() << std::endl;
diff --git a/MuonSpectrometer/MuonGMdbObjects/src/DblQ00Aptp.cxx b/MuonSpectrometer/MuonGMdbObjects/src/DblQ00Aptp.cxx
index 2603209828af01ae0f964077799647145957db62..339cc828a3b320e73c642e59719ee1104e22b609 100644
--- a/MuonSpectrometer/MuonGMdbObjects/src/DblQ00Aptp.cxx
+++ b/MuonSpectrometer/MuonGMdbObjects/src/DblQ00Aptp.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
 
 /***************************************************************************
@@ -94,7 +94,7 @@ DblQ00Aptp::DblQ00Aptp(AmdcDb* aptp) :
 
   int i = -1;
   it = pIRDBRecordset->begin();
-  for( ; it<pIRDBRecordset->end(); it++){
+  for( ; it<pIRDBRecordset->end(); ++it){
      pAmdcDbRecord = dynamic_cast<const AmdcDbRecord*>((*it));
      if(pAmdcDbRecord == 0){
        std::cerr << "No way to cast in AmdcDbRecord for " << getObjName() << std::endl;
diff --git a/MuonSpectrometer/MuonGMdbObjects/src/DblQ00Asmp.cxx b/MuonSpectrometer/MuonGMdbObjects/src/DblQ00Asmp.cxx
index 539c6a22d9e875465bafef0df08738a056e1b55b..074c685b85253ab274f996eebb023ddcb04d7326 100644
--- a/MuonSpectrometer/MuonGMdbObjects/src/DblQ00Asmp.cxx
+++ b/MuonSpectrometer/MuonGMdbObjects/src/DblQ00Asmp.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
 
 /***************************************************************************
@@ -64,7 +64,7 @@ DblQ00Asmp::DblQ00Asmp(AmdcDb* asmp) :
 
   int i = -1;
   it = pIRDBRecordset->begin();
-  for( ; it<pIRDBRecordset->end(); it++){
+  for( ; it<pIRDBRecordset->end(); ++it){
      pAmdcDbRecord = dynamic_cast<const AmdcDbRecord*>((*it));
      if(pAmdcDbRecord == 0){
        std::cerr << "No way to cast in AmdcDbRecord for " << getObjName() << std::endl;
diff --git a/MuonSpectrometer/MuonGMdbObjects/src/DblQ00Aszt.cxx b/MuonSpectrometer/MuonGMdbObjects/src/DblQ00Aszt.cxx
index d61d998a0e1f486438ffc94f1851f021efc9d9d5..ed898a448b4a79bab757b739d57506cc34ea9ff0 100644
--- a/MuonSpectrometer/MuonGMdbObjects/src/DblQ00Aszt.cxx
+++ b/MuonSpectrometer/MuonGMdbObjects/src/DblQ00Aszt.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
 
 /***************************************************************************
@@ -81,7 +81,7 @@ DblQ00Aszt::DblQ00Aszt(AmdcDb* aszt) :
 
   int i = -1;
   it = pIRDBRecordset->begin();
-  for( ; it<pIRDBRecordset->end(); it++){
+  for( ; it<pIRDBRecordset->end(); ++it){
      pAmdcDbRecord = dynamic_cast<const AmdcDbRecord*>((*it));
      if(pAmdcDbRecord == 0){
        std::cerr << "No way to cast in AmdcDbRecord for " << getObjName() << std::endl;
diff --git a/MuonSpectrometer/MuonGMdbObjects/src/DblQ00Atln.cxx b/MuonSpectrometer/MuonGMdbObjects/src/DblQ00Atln.cxx
index 572eac28e3067f97f1eb6014990b1a88aae45f46..f84dad58d88ac1aae9069bf91915ea12060005bf 100644
--- a/MuonSpectrometer/MuonGMdbObjects/src/DblQ00Atln.cxx
+++ b/MuonSpectrometer/MuonGMdbObjects/src/DblQ00Atln.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
 
 /***************************************************************************
@@ -76,7 +76,7 @@ DblQ00Atln::DblQ00Atln(AmdcDb* atln) :
 
   int i = -1;
   it = pIRDBRecordset->begin();
-  for( ; it<pIRDBRecordset->end(); it++){
+  for( ; it<pIRDBRecordset->end(); ++it){
      pAmdcDbRecord = dynamic_cast<const AmdcDbRecord*>((*it));
      if(pAmdcDbRecord == 0){
        std::cerr << "No way to cast in AmdcDbRecord for " << getObjName() << std::endl;
diff --git a/MuonSpectrometer/MuonGMdbObjects/src/DblQ00Atyp.cxx b/MuonSpectrometer/MuonGMdbObjects/src/DblQ00Atyp.cxx
index 11e2a56f337f7b686f118edb0daaf4e92d10695a..667ec4b6384ead5b78c5aedc47fa316c1f783189 100644
--- a/MuonSpectrometer/MuonGMdbObjects/src/DblQ00Atyp.cxx
+++ b/MuonSpectrometer/MuonGMdbObjects/src/DblQ00Atyp.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
 
 /***************************************************************************
@@ -65,7 +65,7 @@ DblQ00Atyp::DblQ00Atyp(AmdcDb* atyp) :
 
   int i = -1;
   it = pIRDBRecordset->begin();
-  for( ; it<pIRDBRecordset->end(); it++){
+  for( ; it<pIRDBRecordset->end(); ++it){
      pAmdcDbRecord = dynamic_cast<const AmdcDbRecord*>((*it));
      if(pAmdcDbRecord == 0){
        std::cerr << "No way to cast in AmdcDbRecord for " << getObjName() << std::endl;
diff --git a/MuonSpectrometer/MuonGMdbObjects/src/DblQ00Awln.cxx b/MuonSpectrometer/MuonGMdbObjects/src/DblQ00Awln.cxx
index 17904fd4aaeb9fb0d34091d7f54be9c8e3e7ded2..3be91fe943e2efd8b074e5a9117bc6840e684d75 100644
--- a/MuonSpectrometer/MuonGMdbObjects/src/DblQ00Awln.cxx
+++ b/MuonSpectrometer/MuonGMdbObjects/src/DblQ00Awln.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
 
 /***************************************************************************
@@ -73,7 +73,7 @@ DblQ00Awln::DblQ00Awln(AmdcDb* awln) :
 
   int i = -1;
   it = pIRDBRecordset->begin();
-  for( ; it<pIRDBRecordset->end(); it++){
+  for( ; it<pIRDBRecordset->end(); ++it){
      pAmdcDbRecord = dynamic_cast<const AmdcDbRecord*>((*it));
      if(pAmdcDbRecord == 0){
        std::cerr << "No way to cast in AmdcDbRecord for " << getObjName() << std::endl;
diff --git a/MuonSpectrometer/MuonGMdbObjects/src/DblQ00Dbam.cxx b/MuonSpectrometer/MuonGMdbObjects/src/DblQ00Dbam.cxx
index 986d08a704bc25f182b2bb80f1f68c40687a41bb..ef4452ed24d2a75578a229e7c12733807f459086 100644
--- a/MuonSpectrometer/MuonGMdbObjects/src/DblQ00Dbam.cxx
+++ b/MuonSpectrometer/MuonGMdbObjects/src/DblQ00Dbam.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
 
 /***************************************************************************
@@ -89,7 +89,7 @@ DblQ00Dbam::DblQ00Dbam(AmdcDb* dbam) :
 
   int i = -1;
   it = pIRDBRecordset->begin();
-  for( ; it<pIRDBRecordset->end(); it++){
+  for( ; it<pIRDBRecordset->end(); ++it){
      pAmdcDbRecord = dynamic_cast<const AmdcDbRecord*>((*it));
      if(pAmdcDbRecord == 0){
        std::cerr << "No way to cast in AmdcDbRecord for " << getObjName() << std::endl;
diff --git a/MuonSpectrometer/MuonGMdbObjects/src/DblQ00IAcsc.cxx b/MuonSpectrometer/MuonGMdbObjects/src/DblQ00IAcsc.cxx
index cfe09283070b8f6a0348be60396f737f8a2ddbb0..16689de780033d33bbb114816d10a93e9d6d83d2 100644
--- a/MuonSpectrometer/MuonGMdbObjects/src/DblQ00IAcsc.cxx
+++ b/MuonSpectrometer/MuonGMdbObjects/src/DblQ00IAcsc.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
 
 /***************************************************************************
@@ -83,7 +83,7 @@ DblQ00IAcsc::DblQ00IAcsc(AmdcDb* iacsc) :
 
   int i = -1;
   it = pIRDBRecordset->begin();
-  for( ; it<pIRDBRecordset->end(); it++){
+  for( ; it<pIRDBRecordset->end(); ++it){
      pAmdcDbRecord = dynamic_cast<const AmdcDbRecord*>((*it));
      if(pAmdcDbRecord == 0){
        std::cerr << "No way to cast in AmdcDbRecord for " << getObjName() << std::endl;
diff --git a/MuonSpectrometer/MuonGMdbObjects/src/DblQ00Wchv.cxx b/MuonSpectrometer/MuonGMdbObjects/src/DblQ00Wchv.cxx
index f056dc6fa539ce0171cf7d78100d809819e1444d..668da4aa2538583400e059c4d78539465eb5b60b 100644
--- a/MuonSpectrometer/MuonGMdbObjects/src/DblQ00Wchv.cxx
+++ b/MuonSpectrometer/MuonGMdbObjects/src/DblQ00Wchv.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
 
 /***************************************************************************
@@ -67,7 +67,7 @@ DblQ00Wchv::DblQ00Wchv(AmdcDb* wchv) :
 
   int i = -1;
   it = pIRDBRecordset->begin();
-  for( ; it<pIRDBRecordset->end(); it++){
+  for( ; it<pIRDBRecordset->end(); ++it){
      pAmdcDbRecord = dynamic_cast<const AmdcDbRecord*>((*it));
      if(pAmdcDbRecord == 0){
        std::cerr << "No way to cast in AmdcDbRecord for " << getObjName() << std::endl;
diff --git a/MuonSpectrometer/MuonGMdbObjects/src/DblQ00Wcmi.cxx b/MuonSpectrometer/MuonGMdbObjects/src/DblQ00Wcmi.cxx
index bf3edef510f19801d3eaff874c679bb53c585d01..a29085ea40882ee53012498d81ff6f7c3b9caa83 100644
--- a/MuonSpectrometer/MuonGMdbObjects/src/DblQ00Wcmi.cxx
+++ b/MuonSpectrometer/MuonGMdbObjects/src/DblQ00Wcmi.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
 
 /***************************************************************************
@@ -67,7 +67,7 @@ DblQ00Wcmi::DblQ00Wcmi(AmdcDb* wcmi) :
 
   int i = -1;
   it = pIRDBRecordset->begin();
-  for( ; it<pIRDBRecordset->end(); it++){
+  for( ; it<pIRDBRecordset->end(); ++it){
      pAmdcDbRecord = dynamic_cast<const AmdcDbRecord*>((*it));
      if(pAmdcDbRecord == 0){
        std::cerr << "No way to cast in AmdcDbRecord for " << getObjName() << std::endl;
diff --git a/MuonSpectrometer/MuonGMdbObjects/src/DblQ00Wcro.cxx b/MuonSpectrometer/MuonGMdbObjects/src/DblQ00Wcro.cxx
index 3e4a1a9fd3e581fb0dec54213aa76a24a1f7f5aa..42a90a071bf5d6b3fe288a781ad613c5e2b8dd2e 100644
--- a/MuonSpectrometer/MuonGMdbObjects/src/DblQ00Wcro.cxx
+++ b/MuonSpectrometer/MuonGMdbObjects/src/DblQ00Wcro.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
 
 /***************************************************************************
@@ -67,7 +67,7 @@ DblQ00Wcro::DblQ00Wcro(AmdcDb* wcro) :
 
   int i = -1;
   it = pIRDBRecordset->begin();
-  for( ; it<pIRDBRecordset->end(); it++){
+  for( ; it<pIRDBRecordset->end(); ++it){
      pAmdcDbRecord = dynamic_cast<const AmdcDbRecord*>((*it));
      if(pAmdcDbRecord == 0){
        std::cerr << "No way to cast in AmdcDbRecord for " << getObjName() << std::endl;
diff --git a/MuonSpectrometer/MuonGMdbObjects/src/DblQ00Wcsc.cxx b/MuonSpectrometer/MuonGMdbObjects/src/DblQ00Wcsc.cxx
index ee8cce4eb5b05e5c0177a48bf651151411860fc5..dca44fefd719ef794b46ce102b3427adff91816e 100644
--- a/MuonSpectrometer/MuonGMdbObjects/src/DblQ00Wcsc.cxx
+++ b/MuonSpectrometer/MuonGMdbObjects/src/DblQ00Wcsc.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
 
 /***************************************************************************
@@ -98,7 +98,7 @@ DblQ00Wcsc::DblQ00Wcsc(AmdcDb* wcsc) :
 
   int i = -1;
   it = pIRDBRecordset->begin();
-  for( ; it<pIRDBRecordset->end(); it++){
+  for( ; it<pIRDBRecordset->end(); ++it){
      pAmdcDbRecord = dynamic_cast<const AmdcDbRecord*>((*it));
      if(pAmdcDbRecord == 0){
        std::cerr << "No way to cast in AmdcDbRecord for " << getObjName() << std::endl;
diff --git a/MuonSpectrometer/MuonGMdbObjects/src/DblQ00Wded.cxx b/MuonSpectrometer/MuonGMdbObjects/src/DblQ00Wded.cxx
index 3b9ca39deb178c0a66cafa63d8cf6f655e0ecc48..449dca3d56e4f1a4497e292a78235fb919d6eca5 100644
--- a/MuonSpectrometer/MuonGMdbObjects/src/DblQ00Wded.cxx
+++ b/MuonSpectrometer/MuonGMdbObjects/src/DblQ00Wded.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
 
 /***************************************************************************
@@ -67,7 +67,7 @@ DblQ00Wded::DblQ00Wded(AmdcDb* wded) :
 
   int i = -1;
   it = pIRDBRecordset->begin();
-  for( ; it<pIRDBRecordset->end(); it++){
+  for( ; it<pIRDBRecordset->end(); ++it){
      pAmdcDbRecord = dynamic_cast<const AmdcDbRecord*>((*it));
      if(pAmdcDbRecord == 0){
        std::cerr << "No way to cast in AmdcDbRecord for " << getObjName() << std::endl;
diff --git a/MuonSpectrometer/MuonGMdbObjects/src/DblQ00Wlbi.cxx b/MuonSpectrometer/MuonGMdbObjects/src/DblQ00Wlbi.cxx
index 473192c3ba51feefc9a4dfd0f9e6158c2347c190..7bc3036f48295fef67688845cd09555dfc901ed9 100644
--- a/MuonSpectrometer/MuonGMdbObjects/src/DblQ00Wlbi.cxx
+++ b/MuonSpectrometer/MuonGMdbObjects/src/DblQ00Wlbi.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
 
 /***************************************************************************
@@ -79,7 +79,7 @@ DblQ00Wlbi::DblQ00Wlbi(AmdcDb* wlbi) :
 
   int i = -1;
   it = pIRDBRecordset->begin();
-  for( ; it<pIRDBRecordset->end(); it++){
+  for( ; it<pIRDBRecordset->end(); ++it){
      pAmdcDbRecord = dynamic_cast<const AmdcDbRecord*>((*it));
      if(pAmdcDbRecord == 0){
        std::cerr << "No way to cast in AmdcDbRecord for " << getObjName() << std::endl;
diff --git a/MuonSpectrometer/MuonGMdbObjects/src/DblQ00Wmdt.cxx b/MuonSpectrometer/MuonGMdbObjects/src/DblQ00Wmdt.cxx
index bd4ca08af3fa2d994b7f71472fc1a02ef4785522..3be93254fed7b6fd5b0d9d591fd9828bd288ee8b 100644
--- a/MuonSpectrometer/MuonGMdbObjects/src/DblQ00Wmdt.cxx
+++ b/MuonSpectrometer/MuonGMdbObjects/src/DblQ00Wmdt.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
 
 /***************************************************************************
@@ -81,7 +81,7 @@ DblQ00Wmdt::DblQ00Wmdt(AmdcDb* wmdt) :
 
   int i = -1;
   it = pIRDBRecordset->begin();
-  for( ; it<pIRDBRecordset->end(); it++){
+  for( ; it<pIRDBRecordset->end(); ++it){
      pAmdcDbRecord = dynamic_cast<const AmdcDbRecord*>((*it));
      if(pAmdcDbRecord == 0){
        std::cerr << "No way to cast in AmdcDbRecord for " << getObjName() << std::endl;
diff --git a/MuonSpectrometer/MuonGMdbObjects/src/DblQ00Wrpc.cxx b/MuonSpectrometer/MuonGMdbObjects/src/DblQ00Wrpc.cxx
index d2dfd39d10b8765d4c7245cab8e61fd27c4c1ed9..9c14c5b80cf7ada49073c691eb27853634cdba05 100644
--- a/MuonSpectrometer/MuonGMdbObjects/src/DblQ00Wrpc.cxx
+++ b/MuonSpectrometer/MuonGMdbObjects/src/DblQ00Wrpc.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
 
 /***************************************************************************
@@ -81,7 +81,7 @@ DblQ00Wrpc::DblQ00Wrpc(AmdcDb* wrpc) :
 
   int i = -1;
   it = pIRDBRecordset->begin();
-  for( ; it<pIRDBRecordset->end(); it++){
+  for( ; it<pIRDBRecordset->end(); ++it){
      pAmdcDbRecord = dynamic_cast<const AmdcDbRecord*>((*it));
      if(pAmdcDbRecord == 0){
        std::cerr << "No way to cast in AmdcDbRecord for " << getObjName() << std::endl;
diff --git a/MuonSpectrometer/MuonGMdbObjects/src/DblQ00Wspa.cxx b/MuonSpectrometer/MuonGMdbObjects/src/DblQ00Wspa.cxx
index 0840a0d251f920e95998b64f588af13706b154e8..b55b65d3269d6b5c8fab665f360da462320d5843 100644
--- a/MuonSpectrometer/MuonGMdbObjects/src/DblQ00Wspa.cxx
+++ b/MuonSpectrometer/MuonGMdbObjects/src/DblQ00Wspa.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
 
 /***************************************************************************
@@ -66,7 +66,7 @@ DblQ00Wspa::DblQ00Wspa(AmdcDb* wspa) :
 
   int i = -1;
   it = pIRDBRecordset->begin();
-  for( ; it<pIRDBRecordset->end(); it++){
+  for( ; it<pIRDBRecordset->end(); ++it){
      pAmdcDbRecord = dynamic_cast<const AmdcDbRecord*>((*it));
      if(pAmdcDbRecord == 0){
        std::cerr << "No way to cast in AmdcDbRecord for " << getObjName() << std::endl;
diff --git a/MuonSpectrometer/MuonGMdbObjects/src/DblQ00Wsup.cxx b/MuonSpectrometer/MuonGMdbObjects/src/DblQ00Wsup.cxx
index 9640257f63759dc451002880cba6839fc0efd787..6b472d173974c76f972f8ae7366b06bfe84c9bc9 100644
--- a/MuonSpectrometer/MuonGMdbObjects/src/DblQ00Wsup.cxx
+++ b/MuonSpectrometer/MuonGMdbObjects/src/DblQ00Wsup.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
 
 /***************************************************************************
@@ -76,7 +76,7 @@ DblQ00Wsup::DblQ00Wsup(AmdcDb* wsup) :
 
   int i = -1;
   it = pIRDBRecordset->begin();
-  for( ; it<pIRDBRecordset->end(); it++){
+  for( ; it<pIRDBRecordset->end(); ++it){
      pAmdcDbRecord = dynamic_cast<const AmdcDbRecord*>((*it));
      if(pAmdcDbRecord == 0){
        std::cerr << "No way to cast in AmdcDbRecord for " << getObjName() << std::endl;
diff --git a/MuonSpectrometer/MuonGMdbObjects/src/DblQ00Wtgc.cxx b/MuonSpectrometer/MuonGMdbObjects/src/DblQ00Wtgc.cxx
index e09c3075e6f95aab544ac2b74ef908424721ac89..ae5b4c16aa1d0cdce8ea908c818bf573c06dfe2c 100644
--- a/MuonSpectrometer/MuonGMdbObjects/src/DblQ00Wtgc.cxx
+++ b/MuonSpectrometer/MuonGMdbObjects/src/DblQ00Wtgc.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
 
 /***************************************************************************
@@ -83,7 +83,7 @@ DblQ00Wtgc::DblQ00Wtgc(AmdcDb* wtgc) :
 
   int i = -1;
   it = pIRDBRecordset->begin();
-  for( ; it<pIRDBRecordset->end(); it++){
+  for( ; it<pIRDBRecordset->end(); ++it){
      pAmdcDbRecord = dynamic_cast<const AmdcDbRecord*>((*it));
      if(pAmdcDbRecord == 0){
        std::cerr << "No way to cast in AmdcDbRecord for " << getObjName() << std::endl;
diff --git a/MuonSpectrometer/MuonGMdbObjects/src/DblQ00Xtomo.cxx b/MuonSpectrometer/MuonGMdbObjects/src/DblQ00Xtomo.cxx
index 50a0a2a8bedafe67d7994196c60c6f234fdd42fc..25464d482f387adb6271b5ead587e84dbcc0e7da 100644
--- a/MuonSpectrometer/MuonGMdbObjects/src/DblQ00Xtomo.cxx
+++ b/MuonSpectrometer/MuonGMdbObjects/src/DblQ00Xtomo.cxx
@@ -110,7 +110,7 @@ DblQ00Xtomo::DblQ00Xtomo(AmdcDb* xtomo) :
 
   int i = -1;
   it = pIRDBRecordset->begin();
-  for( ; it<pIRDBRecordset->end(); it++){
+  for( ; it<pIRDBRecordset->end(); ++it){
      pAmdcDbRecord = dynamic_cast<const AmdcDbRecord*>((*it));
      if(pAmdcDbRecord == 0){
        std::cerr << "No way to cast in AmdcDbRecord for " << getObjName() << std::endl;