From c76f6993761832fcd30ea2bec61489db38cc1600 Mon Sep 17 00:00:00 2001 From: Matti Kortelainen Date: Fri, 26 Oct 2018 20:57:45 +0200 Subject: [PATCH 1/4] Remove const-away cast from OnlineDB/EcalCondDB/src/LMFColor.cc --- OnlineDB/EcalCondDB/src/LMFColor.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OnlineDB/EcalCondDB/src/LMFColor.cc b/OnlineDB/EcalCondDB/src/LMFColor.cc index 76ff09bf90942..4095ad7cb1d05 100644 --- a/OnlineDB/EcalCondDB/src/LMFColor.cc +++ b/OnlineDB/EcalCondDB/src/LMFColor.cc @@ -104,7 +104,7 @@ bool LMFColor::isValid() { boost::ptr_list::const_iterator e = listOfValidColors.end(); bool ret = false; while (i != e) { - LMFColor *c = (LMFColor*)&(*i); + const LMFColor *c = static_cast(&(*i)); if (c->getShortName() == getShortName()) { ret = true; i = e; From 6df7cb09cab86a7f08a7b73e1c83318863e98e77 Mon Sep 17 00:00:00 2001 From: Matti Kortelainen Date: Fri, 26 Oct 2018 22:10:34 +0200 Subject: [PATCH 2/4] Remove const-away cast from OnlineDB/EcalCondDB/src/LMFDefFabric.cc --- OnlineDB/EcalCondDB/src/LMFDefFabric.cc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/OnlineDB/EcalCondDB/src/LMFDefFabric.cc b/OnlineDB/EcalCondDB/src/LMFDefFabric.cc index 3c7ab24be8aff..d555647659296 100644 --- a/OnlineDB/EcalCondDB/src/LMFDefFabric.cc +++ b/OnlineDB/EcalCondDB/src/LMFDefFabric.cc @@ -182,7 +182,7 @@ void LMFDefFabric::initialize() i = listOfObjects.begin(); e = listOfObjects.end(); while (i != e) { - LMFColor *c = (LMFColor*)&(*i); + const LMFColor *c = static_cast(&(*i)); _lmfColors.push_back(*c); i++; } @@ -191,7 +191,7 @@ void LMFDefFabric::initialize() i = listOfObjects.begin(); e = listOfObjects.end(); while (i != e) { - LMFTrigType *c = (LMFTrigType*)&(*i); + const LMFTrigType *c = static_cast(&(*i)); _lmfTrigTypes.push_back(*c); i++; } @@ -200,7 +200,7 @@ void LMFDefFabric::initialize() i = listOfObjects.begin(); e = listOfObjects.end(); while (i != e) { - LMFRunTag *c = (LMFRunTag*)&(*i); + const LMFRunTag *c = static_cast(&(*i)); _lmfRunTags.push_back(*c); i++; } @@ -209,7 +209,7 @@ void LMFDefFabric::initialize() i = listOfObjects.begin(); e = listOfObjects.end(); while (i != e) { - LMFPrimVers *c = (LMFPrimVers*)&(*i); + const LMFPrimVers *c = static_cast(&(*i)); _lmfPrimVersions.push_back(*c); i++; } @@ -218,7 +218,7 @@ void LMFDefFabric::initialize() i = listOfObjects.begin(); e = listOfObjects.end(); while (i != e) { - LMFCorrVers *c = (LMFCorrVers*)&(*i); + const LMFCorrVers *c = static_cast(&(*i)); _lmfCorrVersions.push_back(*c); i++; } @@ -227,7 +227,7 @@ void LMFDefFabric::initialize() i = listOfObjects.begin(); e = listOfObjects.end(); while (i != e) { - LMFSeqVers *c = (LMFSeqVers*)&(*i); + const LMFSeqVers *c = static_cast(&(*i)); _lmfSeqVersions.push_back(*c); i++; } From 37014dbc6ad3ce86bd0fe40b3593abc58ab924a3 Mon Sep 17 00:00:00 2001 From: Matti Kortelainen Date: Fri, 26 Oct 2018 22:40:21 +0200 Subject: [PATCH 3/4] Remove const-away cast from OnlineDB/EcalCondDB/interface/IODConfig.h --- OnlineDB/EcalCondDB/interface/IODConfig.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OnlineDB/EcalCondDB/interface/IODConfig.h b/OnlineDB/EcalCondDB/interface/IODConfig.h index 89e7e5ac82d67..eb4535339e1de 100644 --- a/OnlineDB/EcalCondDB/interface/IODConfig.h +++ b/OnlineDB/EcalCondDB/interface/IODConfig.h @@ -88,7 +88,7 @@ void populateClob (Clob &clob, std::string fname, unsigned int bufsize) noexcept std::cout << "Populating the Clob using writeBuffer(Stream) method" << std::endl; std::cout<<"we are here0"< Date: Mon, 29 Oct 2018 22:10:49 +0100 Subject: [PATCH 4/4] Remove const-away cast from OnlineDB/EcalCondDB/src/MODCCSHFDat.cc --- OnlineDB/EcalCondDB/src/MODCCSHFDat.cc | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/OnlineDB/EcalCondDB/src/MODCCSHFDat.cc b/OnlineDB/EcalCondDB/src/MODCCSHFDat.cc index 618531c17eef5..2e978b3a83ed3 100644 --- a/OnlineDB/EcalCondDB/src/MODCCSHFDat.cc +++ b/OnlineDB/EcalCondDB/src/MODCCSHFDat.cc @@ -264,18 +264,17 @@ void MODCCSHFDat::populateClob (Clob &clob, std::string fname, unsigned int clob cout << "Populating the Clob using writeBuffer(Stream) method" << endl; std::cout<<"we are here0"<