Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Replace throw specifier (deprecated) with noexcept (C++11) #17213

Merged
merged 1 commit into from Jan 23, 2017
Merged

Replace throw specifier (deprecated) with noexcept (C++11) #17213

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 2 additions & 2 deletions OnlineDB/CSCCondDB/interface/CSCCableRead.h
View file
Open in desktop
Expand Up @@ -16,11 +16,11 @@ class csccableread
/**
* Constructor for csccableread
*/
csccableread () throw (oracle::occi::SQLException);
csccableread () noexcept(false);
/**
* Destructor for cscmap
*/
~csccableread () throw (oracle::occi::SQLException);
~csccableread () noexcept(false);

void cable_read (int chamber_index, std::string *chamber_label,
float *cfeb_length, std::string *cfeb_rev, float *alct_length,
Expand Down
4 changes: 2 additions & 2 deletions OnlineDB/CSCCondDB/interface/CSCMap.h
View file
Open in desktop
Expand Up @@ -16,11 +16,11 @@ class cscmap
/**
* Constructor for cscmap
*/
cscmap () throw (oracle::occi::SQLException);
cscmap () noexcept(false);
/**
* Destructor for cscmap
*/
~cscmap () throw (oracle::occi::SQLException);
~cscmap () noexcept(false);

/* Method 'crate0_chamber' returns for a given logical crate
| number 'crate0' (values 0-59) and DMB number 'dmb'
Expand Down
4 changes: 2 additions & 2 deletions OnlineDB/CSCCondDB/interface/CSCMap1.h
View file
Open in desktop
Expand Up @@ -17,11 +17,11 @@ class cscmap1
/**
* Constructor for cscmap1
*/
cscmap1 () throw (oracle::occi::SQLException);
cscmap1 () noexcept(false);
/**
* Destructor for cscmap1
*/
~cscmap1 () throw (oracle::occi::SQLException);
~cscmap1 () noexcept(false);

/* 'chamberid' is a decimal chamber identifier like 122090 */
void chamber (int chamberid, CSCMapItem::MapItem *item);
Expand Down
4 changes: 2 additions & 2 deletions OnlineDB/CSCCondDB/interface/CSCOnlineDB.h
View file
Open in desktop
Expand Up @@ -26,11 +26,11 @@ class condbon
/**
* Constructor for condbon
*/
condbon () throw (oracle::occi::SQLException);
condbon () noexcept(false);
/**
* Destructor for condbon
*/
~condbon () throw (oracle::occi::SQLException);
~condbon () noexcept(false);
/* time should be given in format like "Fri May 26 16:55:51 2006" */
void cdbon_write (CSCobject *obj, std::string obj_name, int record,
int global_run, std::string time);
Expand Down
4 changes: 2 additions & 2 deletions OnlineDB/CSCCondDB/src/CSCCableRead.cc
View file
Open in desktop
Expand Up @@ -4,7 +4,7 @@
/**
* Constructor for csccableread
*/
csccableread::csccableread () throw (oracle::occi::SQLException)
csccableread::csccableread () noexcept(false)
{
std::string db_user;
std::string db_pass;
Expand All @@ -19,7 +19,7 @@
/**
* Destructor for csccableread.
*/
csccableread::~csccableread () throw (oracle::occi::SQLException)
csccableread::~csccableread () noexcept(false)
{
env->terminateConnection (con);
oracle::occi::Environment::terminateEnvironment (env);
Expand Down
4 changes: 2 additions & 2 deletions OnlineDB/CSCCondDB/src/CSCMap.cc
View file
Open in desktop
Expand Up @@ -4,7 +4,7 @@
/**
* Constructor for cscmap
*/
cscmap::cscmap () throw (oracle::occi::SQLException)
cscmap::cscmap () noexcept(false)
{
std::string db_user;
std::string db_pass;
Expand All @@ -19,7 +19,7 @@
/**
* Destructor for cscmap.
*/
cscmap::~cscmap () throw (oracle::occi::SQLException)
cscmap::~cscmap () noexcept(false)
{
env->terminateConnection (con);
oracle::occi::Environment::terminateEnvironment (env);
Expand Down
4 changes: 2 additions & 2 deletions OnlineDB/CSCCondDB/src/CSCMap1.cc
View file
Open in desktop
Expand Up @@ -4,7 +4,7 @@
/**
* Constructor for cscmap1
*/
cscmap1::cscmap1 () throw (oracle::occi::SQLException)
cscmap1::cscmap1 () noexcept(false)
{
std::string db_user;
std::string db_pass;
Expand All @@ -20,7 +20,7 @@
/**
* Destructor for cscmap1.
*/
cscmap1::~cscmap1 () throw (oracle::occi::SQLException)
cscmap1::~cscmap1 () noexcept(false)
{
env->terminateConnection (con);
oracle::occi::Environment::terminateEnvironment (env);
Expand Down
4 changes: 2 additions & 2 deletions OnlineDB/CSCCondDB/src/CSCOnlineDB.cc
View file
Open in desktop
Expand Up @@ -3,7 +3,7 @@
/**
* Constructor for condbon
*/
condbon::condbon () throw (oracle::occi::SQLException)
condbon::condbon () noexcept(false)
{
std::string db_user;
std::string db_pass;
Expand All @@ -18,7 +18,7 @@
/**
* Destructor for condbon.
*/
condbon::~condbon () throw (oracle::occi::SQLException)
condbon::~condbon () noexcept(false)
{
env->terminateConnection (con);
oracle::occi::Environment::terminateEnvironment (env);
Expand Down
8 changes: 4 additions & 4 deletions OnlineDB/EcalCondDB/interface/CaliCrystalIntercalDat.h
View file
Open in desktop
Expand Up @@ -32,16 +32,16 @@ class CaliCrystalIntercalDat : public IDataItem {

private:
void prepareWrite()
throw(std::runtime_error);
noexcept(false);

void writeDB(const EcalLogicID* ecid, const CaliCrystalIntercalDat* item, CaliIOV* iov)
throw(std::runtime_error);
noexcept(false);

void fetchData(std::map< EcalLogicID, CaliCrystalIntercalDat >* fillVec, CaliIOV* iov)
throw(std::runtime_error);
noexcept(false);

void writeArrayDB(const std::map< EcalLogicID, CaliCrystalIntercalDat >* data, CaliIOV* iov)
throw(std::runtime_error);
noexcept(false);



Expand Down
8 changes: 4 additions & 4 deletions OnlineDB/EcalCondDB/interface/CaliGainRatioDat.h
View file
Open in desktop
Expand Up @@ -29,16 +29,16 @@ class CaliGainRatioDat : public IDataItem {

private:
void prepareWrite()
throw(std::runtime_error);
noexcept(false);

void writeDB(const EcalLogicID* ecid, const CaliGainRatioDat* item, CaliIOV* iov)
throw(std::runtime_error);
noexcept(false);

void fetchData(std::map< EcalLogicID, CaliGainRatioDat >* fillVec, CaliIOV* iov)
throw(std::runtime_error);
noexcept(false);

void writeArrayDB(const std::map< EcalLogicID, CaliGainRatioDat >* data, CaliIOV* iov)
throw(std::runtime_error);
noexcept(false);

// User data
float m_g1_g12;
Expand Down
6 changes: 3 additions & 3 deletions OnlineDB/EcalCondDB/interface/CaliGeneralDat.h
View file
Open in desktop
Expand Up @@ -26,13 +26,13 @@ class CaliGeneralDat : public IDataItem {

private:
void prepareWrite()
throw(std::runtime_error);
noexcept(false);

void writeDB(const EcalLogicID* ecid, const CaliGeneralDat* item, CaliIOV* iov)
throw(std::runtime_error);
noexcept(false);

void fetchData(std::map< EcalLogicID, CaliGeneralDat >* fillVec, CaliIOV* iov)
throw(std::runtime_error);
noexcept(false);

// User data
int m_numEvents;
Expand Down
6 changes: 3 additions & 3 deletions OnlineDB/EcalCondDB/interface/CaliHVScanRatioDat.h
View file
Open in desktop
Expand Up @@ -29,13 +29,13 @@ class CaliHVScanRatioDat : public IDataItem {

private:
void prepareWrite()
throw(std::runtime_error);
noexcept(false);

void writeDB(const EcalLogicID* ecid, const CaliHVScanRatioDat* item, CaliIOV* iov)
throw(std::runtime_error);
noexcept(false);

void fetchData(std::map< EcalLogicID, CaliHVScanRatioDat >* fillVec, CaliIOV* iov)
throw(std::runtime_error);
noexcept(false);

// User data
float m_hvratio;
Expand Down
8 changes: 4 additions & 4 deletions OnlineDB/EcalCondDB/interface/CaliIOV.h
View file
Open in desktop
Expand Up @@ -29,8 +29,8 @@ class CaliIOV : public IIOV {

// Methods from IUniqueDBObject
int getID(){ return m_ID;} ;
int fetchID() throw(std::runtime_error);
void setByID(int id) throw(std::runtime_error);
int fetchID() noexcept(false);
void setByID(int id) noexcept(false);

// Operators
inline bool operator==(const CaliIOV &m) const
Expand All @@ -49,8 +49,8 @@ class CaliIOV : public IIOV {
Tm m_till;
CaliTag m_caliTag;

int writeDB() throw(std::runtime_error);
void setByTm(CaliTag* tag, const Tm& time) throw(std::runtime_error);
int writeDB() noexcept(false);
void setByTm(CaliTag* tag, const Tm& time) noexcept(false);
};

#endif
10 changes: 5 additions & 5 deletions OnlineDB/EcalCondDB/interface/CaliTag.h
View file
Open in desktop
Expand Up @@ -36,8 +36,8 @@ class CaliTag : public ITag {


// Methods using ID
int fetchID() throw(std::runtime_error);
void setByID(int id) throw(std::runtime_error);
int fetchID() noexcept(false);
void setByID(int id) noexcept(false);

// Operators
inline bool operator==(const CaliTag &t) const
Expand All @@ -57,11 +57,11 @@ class CaliTag : public ITag {
std::string m_dataType;

// Methods from ITag
int writeDB() throw(std::runtime_error);
void fetchParentIDs(int* locId) throw(std::runtime_error);
int writeDB() noexcept(false);
void fetchParentIDs(int* locId) noexcept(false);

// Public access methods
void fetchAllTags( std::vector<CaliTag>* fillVec) throw(std::runtime_error);
void fetchAllTags( std::vector<CaliTag>* fillVec) noexcept(false);

};

Expand Down
8 changes: 4 additions & 4 deletions OnlineDB/EcalCondDB/interface/CaliTempDat.h
View file
Open in desktop
Expand Up @@ -32,16 +32,16 @@ class CaliTempDat : public IDataItem {

private:
void prepareWrite()
throw(std::runtime_error);
noexcept(false);

void writeDB(const EcalLogicID* ecid, const CaliTempDat* item, CaliIOV* iov)
throw(std::runtime_error);
noexcept(false);

void fetchData(std::map< EcalLogicID, CaliTempDat >* fillVec, CaliIOV* iov)
throw(std::runtime_error);
noexcept(false);

void writeArrayDB(const std::map< EcalLogicID, CaliTempDat >* data, CaliIOV* iov)
throw(std::runtime_error);
noexcept(false);



Expand Down
4 changes: 2 additions & 2 deletions OnlineDB/EcalCondDB/interface/DCSPTMTempList.h
View file
Open in desktop
Expand Up @@ -24,8 +24,8 @@ class DCSPTMTempList : public IDBObject {
std::vector<DCSPTMTemp> getList() ;

// this fills the vector
void fetchValuesForECIDAndTime(const EcalLogicID& ecid, const Tm& start, const Tm& end) throw(std::runtime_error);
void fetchValuesForECID(const EcalLogicID& ecid) throw(std::runtime_error);
void fetchValuesForECIDAndTime(const EcalLogicID& ecid, const Tm& start, const Tm& end) noexcept(false);
void fetchValuesForECID(const EcalLogicID& ecid) noexcept(false);


private:
Expand Down
8 changes: 4 additions & 4 deletions OnlineDB/EcalCondDB/interface/DCUCCSDat.h
View file
Open in desktop
Expand Up @@ -83,16 +83,16 @@ class DCUCCSDat : public IDataItem {

private:
void prepareWrite()
throw(std::runtime_error);
noexcept(false);

void writeDB(const EcalLogicID* ecid, const DCUCCSDat* item, DCUIOV* iov)
throw(std::runtime_error);
noexcept(false);

void writeArrayDB(const std::map< EcalLogicID, DCUCCSDat>* data, DCUIOV* iov)
throw(std::runtime_error);
noexcept(false);

void fetchData(std::map< EcalLogicID, DCUCCSDat >* fillVec, DCUIOV* iov)
throw(std::runtime_error);
noexcept(false);

// User data
float m_m1_vdd1;
Expand Down
8 changes: 4 additions & 4 deletions OnlineDB/EcalCondDB/interface/DCUCapsuleTempDat.h
View file
Open in desktop
Expand Up @@ -23,16 +23,16 @@ class DCUCapsuleTempDat : public IDataItem {

private:
void prepareWrite()
throw(std::runtime_error);
noexcept(false);

void writeDB(const EcalLogicID* ecid, const DCUCapsuleTempDat* item, DCUIOV* iov)
throw(std::runtime_error);
noexcept(false);

void writeArrayDB(const std::map< EcalLogicID, DCUCapsuleTempDat>* data, DCUIOV* iov)
throw(std::runtime_error);
noexcept(false);

void fetchData(std::map< EcalLogicID, DCUCapsuleTempDat >* fillVec, DCUIOV* iov)
throw(std::runtime_error);
noexcept(false);

// User data
float m_capsuleTemp;
Expand Down
8 changes: 4 additions & 4 deletions OnlineDB/EcalCondDB/interface/DCUCapsuleTempRawDat.h
View file
Open in desktop
Expand Up @@ -26,16 +26,16 @@ class DCUCapsuleTempRawDat : public IDataItem {

private:
void prepareWrite()
throw(std::runtime_error);
noexcept(false);

void writeDB(const EcalLogicID* ecid, const DCUCapsuleTempRawDat* item, DCUIOV* iov)
throw(std::runtime_error);
noexcept(false);

void writeArrayDB(const std::map< EcalLogicID, DCUCapsuleTempRawDat>* data, DCUIOV* iov)
throw(std::runtime_error);
noexcept(false);

void fetchData(std::map< EcalLogicID, DCUCapsuleTempRawDat >* fillVec, DCUIOV* iov)
throw(std::runtime_error);
noexcept(false);

// User data
float m_capsuleTempADC;
Expand Down
8 changes: 4 additions & 4 deletions OnlineDB/EcalCondDB/interface/DCUIDarkDat.h
View file
Open in desktop
Expand Up @@ -23,17 +23,17 @@ class DCUIDarkDat : public IDataItem {

private:
void prepareWrite()
throw(std::runtime_error);
noexcept(false);

void writeDB(const EcalLogicID* ecid, const DCUIDarkDat* item, DCUIOV* iov)
throw(std::runtime_error);
noexcept(false);

void writeArrayDB(const std::map< EcalLogicID, DCUIDarkDat>* data, DCUIOV* iov)
throw(std::runtime_error);
noexcept(false);


void fetchData(std::map< EcalLogicID, DCUIDarkDat >* fillVec, DCUIOV* iov)
throw(std::runtime_error);
noexcept(false);

// User data
float m_apdIDark;
Expand Down
8 changes: 4 additions & 4 deletions OnlineDB/EcalCondDB/interface/DCUIDarkPedDat.h
View file
Open in desktop
Expand Up @@ -23,16 +23,16 @@ class DCUIDarkPedDat : public IDataItem {

private:
void prepareWrite()
throw(std::runtime_error);
noexcept(false);

void writeDB(const EcalLogicID* ecid, const DCUIDarkPedDat* item, DCUIOV* iov)
throw(std::runtime_error);
noexcept(false);

void writeArrayDB(const std::map< EcalLogicID, DCUIDarkPedDat>* data, DCUIOV* iov)
throw(std::runtime_error);
noexcept(false);

void fetchData(std::map< EcalLogicID, DCUIDarkPedDat >* fillVec, DCUIOV* iov)
throw(std::runtime_error);
noexcept(false);

// User data
float m_ped;
Expand Down