Skip to content

GitLab

Commit 545f3228 authored by David COME's avatar David COME
Browse files

Removed ALL exception specifications all over castor (expect empty ones)

parent 8b57f78f
Hide whitespace changes
Inline Side-by-side
castor/BaseCnvSvc.cpp
View file @ 545f3228
......@@ -85,7 +85,7 @@ void castor::BaseCnvSvc::removeAlias(const unsigned int id) {
//-----------------------------------------------------------------------------
castor::IConverter* castor::BaseCnvSvc::converter
(const unsigned int origObjType)
throw (castor::exception::Exception) {
{
// First uses aliases
unsigned int objType = origObjType;
if (m_aliases.find(objType) != m_aliases.end()) {
......@@ -121,7 +121,7 @@ void castor::BaseCnvSvc::createRep(castor::IAddress* address,
castor::IObject* object,
bool endTransaction,
unsigned int type)
throw (castor::exception::Exception) {
{
// If no object, nothing to create
if (0 != object) {
// Look for an adapted converter
......@@ -139,7 +139,7 @@ void castor::BaseCnvSvc::bulkCreateRep(castor::IAddress* address,
std::vector<castor::IObject*> &objects,
bool endTransaction,
unsigned int type)
throw (castor::exception::Exception) {
{
// If no object, nothing to create
if (objects.size() > 0) {
// Look for an adapted converter
......@@ -157,7 +157,7 @@ void castor::BaseCnvSvc::bulkCreateRep(castor::IAddress* address,
void castor::BaseCnvSvc::updateRep(castor::IAddress* address,
castor::IObject* object,
bool endTransaction)
throw (castor::exception::Exception) {
{
// If no object, nothing to update
if (0 != object) {
// Look for an adapted converter
......@@ -174,7 +174,7 @@ void castor::BaseCnvSvc::updateRep(castor::IAddress* address,
void castor::BaseCnvSvc::deleteRep(castor::IAddress* address,
castor::IObject* object,
bool endTransaction)
throw (castor::exception::Exception) {
{
// Look for an adapted converter
// The converter is always valid if no exception is thrown
IConverter* conv = converter(object->type());
......@@ -187,7 +187,7 @@ void castor::BaseCnvSvc::deleteRep(castor::IAddress* address,
// -----------------------------------------------------------------------
castor::IObject* castor::BaseCnvSvc::createObj
(castor::IAddress* address)
throw (castor::exception::Exception) {
{
// Look for an adapted converter
// The converter is always valid if no exception is thrown
castor::IConverter* conv = converter(address->objType());
......@@ -199,7 +199,7 @@ castor::IObject* castor::BaseCnvSvc::createObj
// -----------------------------------------------------------------------
std::vector<castor::IObject*> castor::BaseCnvSvc::bulkCreateObj
(castor::IAddress* address)
throw (castor::exception::Exception) {
{
// Look for an adapted converter
// The converter is always valid if no exception is thrown
castor::IConverter* conv = converter(address->objType());
......@@ -210,7 +210,7 @@ std::vector<castor::IObject*> castor::BaseCnvSvc::bulkCreateObj
// updateObj
// -----------------------------------------------------------------------
void castor::BaseCnvSvc::updateObj(castor::IObject* object)
throw (castor::exception::Exception) {
{
// Look for an adapted converter
// The converter is always valid if no exception is thrown
castor::IConverter* conv = converter(object->type());
......@@ -224,7 +224,7 @@ void castor::BaseCnvSvc::fillRep(castor::IAddress* address,
castor::IObject* object,
unsigned int type,
bool endTransaction)
throw (castor::exception::Exception) {
{
// Look for an adapted converter
// The converter is always valid if no exception is thrown
castor::IConverter* conv = converter(object->type());
......@@ -238,7 +238,7 @@ void castor::BaseCnvSvc::fillObj(castor::IAddress* address,
castor::IObject* object,
unsigned int type,
bool endTransaction)
throw (castor::exception::Exception) {
{
// Look for an adapted converter
// The converter is always valid if no exception is thrown
castor::IConverter* conv = converter(object->type());
......@@ -250,7 +250,7 @@ void castor::BaseCnvSvc::fillObj(castor::IAddress* address,
// -----------------------------------------------------------------------
void castor::BaseCnvSvc::deleteRepByAddress (castor::IAddress* address,
bool endTransaction)
throw (castor::exception::Exception) {
{
castor::IObject* obj = createObj(address);
address->setObjType(obj->type());
deleteRep(address, obj, endTransaction);
......@@ -260,7 +260,7 @@ void castor::BaseCnvSvc::deleteRepByAddress (castor::IAddress* address,
// commit
//------------------------------------------------------------------------------
void castor::BaseCnvSvc::commit()
throw (castor::exception::Exception) {
{
// Default implementation, does nothing.
}
......@@ -268,7 +268,7 @@ void castor::BaseCnvSvc::commit()
// rollback
//------------------------------------------------------------------------------
void castor::BaseCnvSvc::rollback()
throw (castor::exception::Exception) {
{
// Default implementation, does nothing.
}
......@@ -276,7 +276,7 @@ void castor::BaseCnvSvc::rollback()
// createStatement
//------------------------------------------------------------------------------
castor::db::IDbStatement* castor::BaseCnvSvc::createStatement(const std::string&)
throw (castor::exception::Exception) {
{
// Default implementation, does nothing.
return 0;
}
castor/BaseCnvSvc.hpp
View file @ 545f3228
......@@ -91,7 +91,7 @@ namespace castor {
* is found
*/
virtual IConverter* converter(const unsigned int objType)
throw (castor::exception::Exception);
;
/**
* gets the representation type, that is the type of
......@@ -115,7 +115,7 @@ namespace castor {
IObject* object,
bool endTransaction,
unsigned int type = OBJ_INVALID)
throw (castor::exception::Exception);
;
/**
* create foreign representations from a set of C++ Object
......@@ -133,7 +133,7 @@ namespace castor {
std::vector<IObject*> &objects,
bool endTransaction,
unsigned int type)
throw (castor::exception::Exception);
;
/**
* Updates foreign representation from a C++ Object.
......@@ -147,7 +147,7 @@ namespace castor {
virtual void updateRep(IAddress* address,
IObject* object,
bool endTransaction)
throw (castor::exception::Exception);
;
/**
* Deletes foreign representation of a C++ Object.
......@@ -161,7 +161,7 @@ namespace castor {
virtual void deleteRep(castor::IAddress* address,
castor::IObject* object,
bool endTransaction)
throw (castor::exception::Exception);
;
/**
* Creates C++ object from foreign representation
......@@ -173,7 +173,7 @@ namespace castor {
* @exception Exception throws an Exception in case of error
*/
virtual IObject* createObj (IAddress* address)
throw (castor::exception::Exception);
;
/**
* create C++ objects from foreign representations
......@@ -185,7 +185,7 @@ namespace castor {
* @exception Exception throws an Exception in case of error
*/
virtual std::vector<IObject*> bulkCreateObj(IAddress* address)
throw (castor::exception::Exception);
;
/**
* Updates C++ object from its foreign representation.
......@@ -193,7 +193,7 @@ namespace castor {
* @exception Exception throws an Exception in case of error
*/
virtual void updateObj(IObject* object)
throw (castor::exception::Exception);
;
/**
* Fill the foreign representation with some of the objects
......@@ -209,7 +209,7 @@ namespace castor {
castor::IObject* object,
unsigned int type,
bool endTransaction = false)
throw (castor::exception::Exception);
;
/**
* Retrieve from the foreign representation some of the
......@@ -225,7 +225,7 @@ namespace castor {
castor::IObject* object,
unsigned int type,
bool endTransaction = false)
throw (castor::exception::Exception);
;
/**
* Forces the commit of the last changes.
......@@ -235,7 +235,7 @@ namespace castor {
* @exception Exception throws an Exception in case of error
*/
virtual void commit()
throw (castor::exception::Exception);
;
/**
* Forces the rollback of the last changes
......@@ -245,7 +245,7 @@ namespace castor {
* @exception Exception throws an Exception in case of error
*/
virtual void rollback()
throw (castor::exception::Exception);
;
/**
* Creates a prepared statement wrapped with the
......@@ -253,7 +253,7 @@ namespace castor {
* @param stmt the string statement to be prepared
*/
virtual castor::db::IDbStatement* createStatement(const std::string& stmt)
throw (castor::exception::Exception);
;
/**
* Deletes foreign representation of a C++ Object without
......@@ -268,7 +268,7 @@ namespace castor {
*/
virtual void deleteRepByAddress (IAddress* address,
bool endTransaction = true)
throw (castor::exception::Exception);
;
private:
/**
......
castor/BaseObject.cpp
View file @ 545f3228
......@@ -45,7 +45,7 @@ castor::BaseObject::BaseObject() throw() {}
// sharedServices
//------------------------------------------------------------------------------
castor::Services* castor::BaseObject::sharedServices()
throw (castor::exception::Exception) {
{
// since this is the shared version, the instantiation of the singleton
// has to be thread-safe.
if (0 == s_sharedServices) {
......@@ -62,7 +62,7 @@ castor::Services* castor::BaseObject::sharedServices()
// svcs
//------------------------------------------------------------------------------
castor::Services* castor::BaseObject::svcs()
throw (castor::exception::Exception) {
{
return services();
}
......@@ -70,7 +70,7 @@ castor::Services* castor::BaseObject::svcs()
// services
//------------------------------------------------------------------------------
castor::Services* castor::BaseObject::services()
throw (castor::exception::Exception) {
{
castor::Services *services =
(castor::Services *)pthread_getspecific(s_servicesKey);
......@@ -95,7 +95,7 @@ castor::Services* castor::BaseObject::services()
// resetServices
//------------------------------------------------------------------------------
void castor::BaseObject::resetServices()
throw (castor::exception::Exception) {
{
// If the services where not allocated (unlikely), this will have the
// side effect of allocating them. The key will be created anyhow,
// which is what we need.
......
castor/BaseObject.hpp
View file @ 545f3228
......@@ -55,24 +55,24 @@ namespace castor {
/**
* Static access to the underlying thread-safe Services object
*/
static Services* services() throw(castor::exception::Exception);
static Services* services() ;
/**
* Static function to reset (deallocate + set the thread specific pointer
* to NULL) the thread-specific services. Useful in test environments and
* for clients which to not run the thread pools (but use the marshallers)
*/
static void resetServices() throw(castor::exception::Exception);
static void resetServices() ;
/**
* Static access to the underlying thread-shared Services object
*/
static Services* sharedServices() throw(castor::exception::Exception);
static Services* sharedServices() ;
/**
* Non static access to the underlying Services object
*/
Services* svcs() throw(castor::exception::Exception);
Services* svcs() ;
protected:
......@@ -88,7 +88,7 @@ namespace castor {
*/
class pthreadKey {
public:
pthreadKey() throw (castor::exception::Exception) {
pthreadKey() {
int rc = pthread_key_create(&m_key, NULL);
if (rc != 0) {
castor::exception::Exception e(rc);
......
castor/IClientFactory.cpp
View file @ 545f3228
......@@ -38,7 +38,7 @@
//------------------------------------------------------------------------------
const std::string castor::IClientFactory::client2String
(const castor::IClient &cl)
throw (castor::exception::Exception) {
{
switch (cl.type()) {
case castor::OBJ_Client :
{
......@@ -67,7 +67,7 @@ const std::string castor::IClientFactory::client2String
// string2Client
//------------------------------------------------------------------------------
castor::IClient* castor::IClientFactory::string2Client(const std::string &st)
throw (castor::exception::Exception) {
{
std::istringstream in(st);
unsigned int type;
in >> type;
......
castor/IClientFactory.hpp
View file @ 545f3228
......@@ -51,7 +51,7 @@ namespace castor {
*/
static const std::string client2String
(const castor::IClient &cl)
throw (castor::exception::Exception);
;
/**
* creates a Client from its human readable
......@@ -64,7 +64,7 @@ namespace castor {
*/
static castor::IClient* string2Client
(const std::string &st)
throw (castor::exception::Exception);
;
}; // end of class IClientFactory
......
castor/ICnvSvc.hpp
View file @ 545f3228
......@@ -76,7 +76,7 @@ namespace castor {
IObject* object,
bool endTransaction,
unsigned int type = castor::OBJ_INVALID)
throw (castor::exception::Exception) = 0;
= 0;
/**
* create foreign representations from a set of C++ Object
......@@ -94,7 +94,7 @@ namespace castor {
std::vector<IObject*> &objects,
bool endTransaction,
unsigned int type = castor::OBJ_INVALID)
throw (castor::exception::Exception) = 0;
= 0;
/**
* Updates foreign representation from a C++ Object.
......@@ -108,7 +108,7 @@ namespace castor {
virtual void updateRep(IAddress* address,
IObject* object,
bool endTransaction)
throw (castor::exception::Exception) = 0;
= 0;
/**
* Deletes foreign representation of a C++ Object.
......@@ -122,7 +122,7 @@ namespace castor {
virtual void deleteRep(castor::IAddress* address,
castor::IObject* object,
bool endTransaction = true)
throw (castor::exception::Exception) = 0;
= 0;
/**
* create C++ object from foreign representation
......@@ -134,7 +134,7 @@ namespace castor {
* @exception Exception throws an Exception in case of error
*/
virtual IObject* createObj (IAddress* address)
throw (castor::exception::Exception) = 0;
= 0;
/**
* create C++ objects from foreign representations
......@@ -146,7 +146,7 @@ namespace castor {
* @exception Exception throws an Exception in case of error
*/
virtual std::vector<IObject*> bulkCreateObj(IAddress* address)
throw (castor::exception::Exception) = 0;
= 0;
/**
* Updates C++ object from its foreign representation.
......@@ -154,7 +154,7 @@ namespace castor {
* @exception Exception throws an Exception in case of error
*/
virtual void updateObj(IObject* object)
throw (castor::exception::Exception) = 0;
= 0;
/**
* Fill the foreign representation with some of the objects
......@@ -170,7 +170,7 @@ namespace castor {
castor::IObject* object,
unsigned int type,
bool endTransaction = false)
throw (castor::exception::Exception) = 0;
= 0;
/**
* Retrieve from the foreign representation some of the
......@@ -186,21 +186,21 @@ namespace castor {
castor::IObject* object,
unsigned int type,
bool endTransaction = false)
throw (castor::exception::Exception) = 0;
= 0;
/**
* Forces the commit of the last changes.
* @exception Exception throws an Exception in case of error
*/
virtual void commit()
throw (castor::exception::Exception) = 0;
= 0;
/**
* Forces the rollback of the last changes
* @exception Exception throws an Exception in case of error
*/
virtual void rollback()
throw (castor::exception::Exception) = 0;
= 0;
/**
* Creates a prepared statement wrapped with the
......@@ -208,7 +208,7 @@ namespace castor {
* @param stmt the string statement to be prepared
*/
virtual castor::db::IDbStatement* createStatement(const std::string& stmt)
throw (castor::exception::Exception) = 0;
= 0;
/**
* Deletes foreign representation of a C++ Object without
......@@ -223,7 +223,7 @@ namespace castor {
*/
virtual void deleteRepByAddress(IAddress* address,
bool endTransaction = true)
throw (castor::exception::Exception) = 0;
= 0;
};
......
castor/IConverter.hpp
View file @ 545f3228
......@@ -79,7 +79,7 @@ namespace castor {
IObject* object,
bool endTransaction,
unsigned int type)
throw (castor::exception::Exception) = 0;
= 0;
/**
* create foreign representations from a set of C++ Object
......@@ -97,7 +97,7 @@ namespace castor {
std::vector<IObject*> &objects,
bool endTransaction,
unsigned int type)
throw (castor::exception::Exception) = 0;
= 0;
/**
* Updates foreign representation from a C++ Object.
......@@ -111,7 +111,7 @@ namespace castor {
virtual void updateRep(IAddress* address,
IObject* object,
bool endTransaction)
throw (castor::exception::Exception) = 0;
= 0;
/**
* deletes foreign representation of a C++ Object
......@@ -125,7 +125,7 @@ namespace castor {
virtual void deleteRep(IAddress* address,
IObject* object,
bool endTransaction)
throw (castor::exception::Exception) = 0;
= 0;
/**
* create C++ object from foreign representation
......@@ -137,7 +137,7 @@ namespace castor {
* @exception Exception throws an Exception in case of error
*/
virtual IObject* createObj(IAddress* address)
throw (castor::exception::Exception) = 0;
= 0;
/**
* create C++ objects from foreign representations
......@@ -149,7 +149,7 @@ namespace castor {
* @exception Exception throws an Exception in case of error
*/
virtual std::vector<IObject*> bulkCreateObj(IAddress* address)
throw (castor::exception::Exception) = 0;
= 0;
/**
* Updates C++ object from its foreign representation.
......@@ -157,7 +157,7 @@ namespace castor {
* @exception Exception throws an Exception in case of error
*/
virtual void updateObj(IObject* object)
throw (castor::exception::Exception) = 0;
= 0;
/**
......@@ -174,7 +174,7 @@ namespace castor {
castor::IObject* object,
unsigned int type,
bool endTransaction = false)
throw (castor::exception::Exception) = 0;
= 0;
/**
* Retrieve from the foreign representation some of the
......@@ -190,7 +190,7 @@ namespace castor {
castor::IObject* object,
unsigned int type,
bool endTransaction = false)
throw (castor::exception::Exception) = 0;
= 0;
};
......
castor/Services.cpp
View file @ 545f3228
......@@ -58,7 +58,7 @@ castor::Services::~Services() {
//-----------------------------------------------------------------------------
castor::IService* castor::Services::service(const std::string name,
const unsigned int id)
throw(castor::exception::Exception) {
{
std::map<const std::string, IService*>::const_iterator it = m_services.find(name);
if (it == m_services.end()) {
if (id > 0) {
......@@ -93,7 +93,7 @@ castor::IService* castor::Services::service(const std::string name,
//-----------------------------------------------------------------------------
castor::ICnvSvc* castor::Services::cnvService(const std::string name,
const unsigned int id)
throw(castor::exception::Exception) {
{
IService* svc = service(name, id);
if (0 == svc) {
return 0;
......@@ -111,7 +111,7 @@ castor::ICnvSvc* castor::Services::cnvService(const std::string name,
void castor::Services::createRep(castor::IAddress* address,
castor::IObject* object,
bool endTransaction)
throw (castor::exception::Exception) {
{
// Always returns a valid cnvSvc or throws an exception
castor::ICnvSvc* cnvSvc = cnvSvcFromAddress(address);
cnvSvc->createRep(address, object, endTransaction);
......@@ -123,7 +123,7 @@ void castor::Services::createRep(castor::IAddress* address,
void castor::Services::bulkCreateRep(castor::IAddress* address,
std::vector<castor::IObject*> &objects,
bool endTransaction)
throw (castor::exception::Exception) {
{
// Always returns a valid cnvSvc or throws an exception
castor::ICnvSvc* cnvSvc = cnvSvcFromAddress(address);
cnvSvc->bulkCreateRep(address, objects, endTransaction);
......@@ -135,7 +135,7 @@ void castor::Services::bulkCreateRep(castor::IAddress* address,
void castor::Services::updateRep(castor::IAddress* address,
castor::IObject* object,
bool endTransaction)
throw (castor::exception::Exception) {
{
// Always returns a valid cnvSvc or throws an exception
castor::ICnvSvc* cnvSvc = cnvSvcFromAddress(address);
cnvSvc->updateRep(address, object, endTransaction);
......@@ -147,7 +147,7 @@ void castor::Services::updateRep(castor::IAddress* address,
void castor::Services::deleteRep(castor::IAddress* address,
castor::IObject* object,
bool endTransaction)
throw (castor::exception::Exception) {
{
// Always returns a valid cnvSvc or throws an exception
castor::ICnvSvc* cnvSvc = cnvSvcFromAddress(address);
cnvSvc->deleteRep(address, object, endTransaction);
......@@ -158,7 +158,7 @@ void castor::Services::deleteRep(castor::IAddress* address,
// -----------------------------------------------------------------------
castor::ICnvSvc*
castor::Services::cnvSvcFromAddress(castor::IAddress* address)
throw (castor::exception::Exception) {
{
// check address
if (0 == address) {
castor::exception::Exception ex;
......@@ -182,7 +182,7 @@ castor::Services::cnvSvcFromAddress(castor::IAddress* address)
// createObj
// -----------------------------------------------------------------------
castor::IObject* castor::Services::createObj(castor::IAddress* address)
throw (castor::exception::Exception) {
{
// Always returns a valid cnvSvc or throws an exception
castor::ICnvSvc* cnvSvc = cnvSvcFromAddress(address);
castor::IObject* result = cnvSvc->createObj(address);
......@@ -194,7 +194,7 @@ castor::IObject* castor::Services::createObj(castor::IAddress* address)
// -----------------------------------------------------------------------
std::vector<castor::IObject*>
castor::Services::bulkCreateObj(castor::IAddress* address)
throw (castor::exception::Exception) {
{
// Always returns a valid cnvSvc or throws an exception
castor::ICnvSvc* cnvSvc = cnvSvcFromAddress(address);
std::vector<castor::IObject*> result = cnvSvc->bulkCreateObj(address);
......@@ -206,7 +206,7 @@ castor::Services::bulkCreateObj(castor::IAddress* address)
//------------------------------------------------------------------------------
void castor::Services::updateObj(castor::IAddress* address,
castor::IObject* object)
throw (castor::exception::Exception) {
{
// Always returns a valid cnvSvc or throws an exception
castor::ICnvSvc* cnvSvc = cnvSvcFromAddress(address);