From be9f7c7b6cf3667372774f42b20a23e6e3c3e96c Mon Sep 17 00:00:00 2001 From: Ovidiu Mircescu Date: Fri, 1 May 2020 12:46:42 +0200 Subject: [PATCH] Remove c++11 warnings about throw specification. --- Demo/echoSrv.cxx | 4 +- src/engine/Any.cxx | 40 +++++------ src/engine/Any.hxx | 54 +++++++------- src/engine/AnyInputPort.cxx | 2 +- src/engine/AnyInputPort.hxx | 2 +- src/engine/AnyOutputPort.cxx | 4 +- src/engine/AnyOutputPort.hxx | 4 +- src/engine/Bloc.cxx | 8 +-- src/engine/Bloc.hxx | 8 +-- src/engine/ComposedNode.cxx | 64 ++++++++--------- src/engine/ComposedNode.hxx | 72 +++++++++---------- src/engine/ConditionInputPort.cxx | 4 +- src/engine/ConditionInputPort.hxx | 4 +- src/engine/Container.hxx | 4 +- src/engine/DataPort.hxx | 2 +- src/engine/DynParaLoop.cxx | 22 +++--- src/engine/DynParaLoop.hxx | 22 +++--- src/engine/ElementaryNode.cxx | 26 +++---- src/engine/ElementaryNode.hxx | 42 +++++------ src/engine/ForEachLoop.cxx | 22 +++--- src/engine/ForEachLoop.hxx | 22 +++--- src/engine/ForLoop.cxx | 6 +- src/engine/ForLoop.hxx | 6 +- src/engine/InPort.cxx | 2 +- src/engine/InPort.hxx | 2 +- src/engine/InPropertyPort.cxx | 2 +- src/engine/InPropertyPort.hxx | 2 +- src/engine/InlineNode.cxx | 2 +- src/engine/InlineNode.hxx | 2 +- src/engine/InputPort.cxx | 6 +- src/engine/InputPort.hxx | 8 +-- src/engine/LinkInfo.cxx | 8 +-- src/engine/LinkInfo.hxx | 8 +-- src/engine/Loop.cxx | 38 +++++----- src/engine/Loop.hxx | 38 +++++----- src/engine/Node.cxx | 14 ++-- src/engine/Node.hxx | 26 +++---- src/engine/OptimizerAlg.cxx | 4 +- src/engine/OptimizerAlg.hxx | 4 +- src/engine/OptimizerLoop.cxx | 12 ++-- src/engine/OptimizerLoop.hxx | 12 ++-- src/engine/OutGate.cxx | 2 +- src/engine/OutGate.hxx | 2 +- src/engine/OutPort.hxx | 4 +- src/engine/OutputDataStreamPort.cxx | 10 +-- src/engine/OutputDataStreamPort.hxx | 10 +-- src/engine/OutputPort.cxx | 16 ++--- src/engine/OutputPort.hxx | 16 ++--- src/engine/Plugin/PluginSimplex.cxx | 2 +- src/engine/Plugin/PluginSimplex.hxx | 2 +- src/engine/Pool.cxx | 6 +- src/engine/Pool.hxx | 6 +- src/engine/Runtime.cxx | 2 +- src/engine/Runtime.hxx | 8 +-- src/engine/ServiceNode.cxx | 2 +- src/engine/ServiceNode.hxx | 2 +- src/engine/Switch.cxx | 34 ++++----- src/engine/Switch.hxx | 34 ++++----- src/engine/Test/ContainerTest.cxx | 8 +-- src/engine/Test/ContainerTest.hxx | 8 +-- src/engine/Test/PluginOptEvTest1.cxx | 2 +- src/engine/Test/PluginOptEvTest1.hxx | 2 +- .../Test/RuntimeForEngineIntegrationTest.cxx | 6 +- .../Test/RuntimeForEngineIntegrationTest.hxx | 6 +- src/engine/Test/RuntimeForEngineTest.cxx | 12 ++-- src/engine/Test/RuntimeForEngineTest.hxx | 12 ++-- src/engine/Test/ToyNode.cxx | 30 ++++---- src/engine/Test/ToyNode.hxx | 30 ++++---- src/engine/TypeCode.cxx | 34 ++++----- src/engine/TypeCode.hxx | 34 ++++----- src/engine/VisitorSaveSchema.cxx | 2 +- src/engine/VisitorSaveSchema.hxx | 2 +- src/engine/VisitorSaveState.cxx | 2 +- src/engine/VisitorSaveState.hxx | 2 +- src/engine/WhileLoop.cxx | 4 +- src/engine/WhileLoop.hxx | 4 +- src/runtime/CORBACORBAConv.cxx | 4 +- src/runtime/CORBACORBAConv.hxx | 4 +- src/runtime/CORBACppConv.cxx | 4 +- src/runtime/CORBACppConv.hxx | 4 +- src/runtime/CORBANeutralConv.cxx | 4 +- src/runtime/CORBANeutralConv.hxx | 4 +- src/runtime/CORBAPorts.cxx | 10 +-- src/runtime/CORBAPorts.hxx | 10 +-- src/runtime/CORBAPythonConv.cxx | 28 ++++---- src/runtime/CORBAPythonConv.hxx | 28 ++++---- src/runtime/CORBAXMLConv.cxx | 4 +- src/runtime/CORBAXMLConv.hxx | 4 +- src/runtime/CalStreamPort.cxx | 4 +- src/runtime/CalStreamPort.hxx | 4 +- src/runtime/CppCORBAConv.cxx | 4 +- src/runtime/CppCORBAConv.hxx | 4 +- src/runtime/CppComponent.cxx | 2 +- src/runtime/CppComponent.hxx | 2 +- src/runtime/CppContainer.cxx | 6 +- src/runtime/CppContainer.hxx | 6 +- src/runtime/CppCppConv.cxx | 4 +- src/runtime/CppCppConv.hxx | 4 +- src/runtime/CppNeutralConv.cxx | 4 +- src/runtime/CppNeutralConv.hxx | 4 +- src/runtime/CppPorts.cxx | 10 +-- src/runtime/CppPorts.hxx | 10 +-- src/runtime/CppPythonConv.cxx | 4 +- src/runtime/CppPythonConv.hxx | 4 +- src/runtime/CppXMLConv.cxx | 4 +- src/runtime/CppXMLConv.hxx | 4 +- src/runtime/NeutralCORBAConv.cxx | 28 ++++---- src/runtime/NeutralCORBAConv.hxx | 28 ++++---- src/runtime/NeutralCppConv.cxx | 4 +- src/runtime/NeutralCppConv.hxx | 4 +- src/runtime/NeutralInitConv.cxx | 4 +- src/runtime/NeutralInitConv.hxx | 4 +- src/runtime/NeutralPythonConv.cxx | 28 ++++---- src/runtime/NeutralPythonConv.hxx | 28 ++++---- src/runtime/NeutralXMLConv.cxx | 4 +- src/runtime/NeutralXMLConv.hxx | 4 +- src/runtime/OutNode.cxx | 2 +- src/runtime/OutNode.hxx | 2 +- src/runtime/PresetNode.cxx | 2 +- src/runtime/PresetNode.hxx | 2 +- src/runtime/PresetPorts.cxx | 2 +- src/runtime/PresetPorts.hxx | 2 +- src/runtime/PyOptimizerAlg.cxx | 2 +- src/runtime/PyOptimizerAlg.hxx | 2 +- src/runtime/PythonCORBAConv.cxx | 28 ++++---- src/runtime/PythonCORBAConv.hxx | 28 ++++---- src/runtime/PythonCppConv.cxx | 4 +- src/runtime/PythonCppConv.hxx | 4 +- src/runtime/PythonInitConv.cxx | 4 +- src/runtime/PythonInitConv.hxx | 4 +- src/runtime/PythonNeutralConv.cxx | 4 +- src/runtime/PythonNeutralConv.hxx | 4 +- src/runtime/PythonNode.cxx | 4 +- src/runtime/PythonNode.hxx | 4 +- src/runtime/PythonPorts.cxx | 12 ++-- src/runtime/PythonPorts.hxx | 12 ++-- src/runtime/PythonXMLConv.cxx | 4 +- src/runtime/PythonXMLConv.hxx | 4 +- src/runtime/RuntimeSALOME.cxx | 62 ++++++++-------- src/runtime/RuntimeSALOME.hxx | 62 ++++++++-------- src/runtime/SalomeContainer.cxx | 4 +- src/runtime/SalomeContainer.hxx | 4 +- src/runtime/SalomeHPContainer.cxx | 4 +- src/runtime/SalomeHPContainer.hxx | 4 +- src/runtime/StudyNodes.cxx | 4 +- src/runtime/StudyNodes.hxx | 4 +- src/runtime/Test/echoSrv.cxx | 4 +- src/runtime/Test/runtimeTest.cxx | 2 +- src/runtime/XMLCORBAConv.cxx | 4 +- src/runtime/XMLCORBAConv.hxx | 4 +- src/runtime/XMLCppConv.cxx | 4 +- src/runtime/XMLCppConv.hxx | 4 +- src/runtime/XMLNeutralConv.cxx | 4 +- src/runtime/XMLNeutralConv.hxx | 4 +- src/runtime/XMLPorts.cxx | 12 ++-- src/runtime/XMLPorts.hxx | 12 ++-- src/runtime/XMLPythonConv.cxx | 4 +- src/runtime/XMLPythonConv.hxx | 4 +- .../Test/OptimizerAlgASyncExample.cxx | 4 +- .../Test/OptimizerAlgSyncExample.cxx | 4 +- src/yacsloader/Test/echoSrv.cxx | 4 +- src/yacsloader/loopParsers.hxx | 4 +- 162 files changed, 841 insertions(+), 841 deletions(-) diff --git a/Demo/echoSrv.cxx b/Demo/echoSrv.cxx index ac256e1e5..9ebb9c648 100644 --- a/Demo/echoSrv.cxx +++ b/Demo/echoSrv.cxx @@ -91,7 +91,7 @@ public: inline Echo_i() {} virtual ~Echo_i() {} virtual char* echoString(const char* mesg); - CORBA::Long echoLong(CORBA::Long i) throw(eo::SALOME_Exception); + CORBA::Long echoLong(CORBA::Long i); void echoDouble(CORBA::Double i,CORBA::Double& j) ; void echoDoubleVec(const eo::DoubleVec& i,eo::DoubleVec_out j) ; void echoDoubleVecVec(const eo::DoubleVecVec&, eo::DoubleVecVec_out); @@ -192,7 +192,7 @@ void Echo_i::echoDoubleVecVec(const eo::DoubleVecVec& in, eo::DoubleVecVec_out o out=new eo::DoubleVecVec(in); } -CORBA::Long Echo_i::echoLong(CORBA::Long i ) throw(eo::SALOME_Exception) +CORBA::Long Echo_i::echoLong(CORBA::Long i ) { DEBTRACE("Echo_i::echoLong " << i); CORBA::Long j=i; diff --git a/src/engine/Any.cxx b/src/engine/Any.cxx index c796d9ffd..7424a410a 100644 --- a/src/engine/Any.cxx +++ b/src/engine/Any.cxx @@ -336,12 +336,12 @@ AtomAny *AtomAny::New(const std::string& val, TypeCode *type) return new AtomAny(val,type); } -AnyPtr AtomAny::operator[](int i) const throw(YACS::Exception) +AnyPtr AtomAny::operator[](int i) const { throw InvalidExtractionException(_type->kind(),Sequence); } -AnyPtr AtomAny::operator[](const char *key) const throw(YACS::Exception) +AnyPtr AtomAny::operator[](const char *key) const { throw Exception("AtomAny::operator[] : try to get a part of a partitionned data whereas atomical."); } @@ -363,7 +363,7 @@ bool AtomAny::operator ==(const Any& other) const return false; } -int AtomAny::getIntValue() const throw(YACS::Exception) +int AtomAny::getIntValue() const { if(_type->isA(Runtime::_tc_int)) return _value._i; @@ -371,7 +371,7 @@ int AtomAny::getIntValue() const throw(YACS::Exception) throw Exception("Value is not an int"); } -bool AtomAny::getBoolValue() const throw(YACS::Exception) +bool AtomAny::getBoolValue() const { if(_type->isA(Runtime::_tc_bool)) return _value._b; @@ -379,7 +379,7 @@ bool AtomAny::getBoolValue() const throw(YACS::Exception) throw Exception("Value is not a bool"); } -double AtomAny::getDoubleValue() const throw(YACS::Exception) +double AtomAny::getDoubleValue() const { if(_type->isA(Runtime::_tc_double)) return _value._d; @@ -387,7 +387,7 @@ double AtomAny::getDoubleValue() const throw(YACS::Exception) throw Exception("Value is not a double"); } -std::string AtomAny::getStringValue() const throw(YACS::Exception) +std::string AtomAny::getStringValue() const { if(_type->isA(Runtime::_tc_string) || _type->kind()==YACS::ENGINE::Objref) { @@ -507,33 +507,33 @@ ComposedAny::ComposedAny(TypeCode* type, bool isNew):Any(type) _type->decrRef(); } -AnyPtr ComposedAny::operator[](const char *key) const throw(YACS::Exception) +AnyPtr ComposedAny::operator[](const char *key) const { throw Exception("AtomAny::operator[] : try to get a part of a partitionned data not localizable by a string."); } -void ComposedAny::checkTypeOf(const Any *elem) const throw(YACS::Exception) +void ComposedAny::checkTypeOf(const Any *elem) const { if(!elem->getType()->isA(_type->contentType())) throw Exception("ComposedAny::checkTypeOf : invalid type."); } -int ComposedAny::getIntValue() const throw(YACS::Exception) +int ComposedAny::getIntValue() const { throw InvalidExtractionException(_type->kind(),Runtime::_tc_int->kind()); } -bool ComposedAny::getBoolValue() const throw(YACS::Exception) +bool ComposedAny::getBoolValue() const { throw InvalidExtractionException(_type->kind(),Runtime::_tc_bool->kind()); } -double ComposedAny::getDoubleValue() const throw(YACS::Exception) +double ComposedAny::getDoubleValue() const { throw InvalidExtractionException(_type->kind(),Runtime::_tc_double->kind()); } -std::string ComposedAny::getStringValue() const throw(YACS::Exception) +std::string ComposedAny::getStringValue() const { throw InvalidExtractionException(_type->kind(),Runtime::_tc_string->kind()); } @@ -693,14 +693,14 @@ bool SequenceAny::operator ==(const Any& other) const return true; } -void SequenceAny::setEltAtRank(int i, const Any *elem) throw(YACS::Exception) +void SequenceAny::setEltAtRank(int i, const Any *elem) { checkTypeOf(elem); _alloc.destroy(_alloc._start+i*_alloc._sizeOf1Elm,_type->contentType()); _alloc.construct(_alloc._start+i*_alloc._sizeOf1Elm,elem); } -AnyPtr SequenceAny::operator[](int i) const throw(YACS::Exception) +AnyPtr SequenceAny::operator[](int i) const { return _type->contentType()->getOrBuildAnyFromZippedData(_alloc._start+i*_alloc._sizeOf1Elm); } @@ -972,7 +972,7 @@ ArrayAny::ArrayAny(const std::vector& val):ComposedAny(new TypeCode } } -void ArrayAny::setEltAtRank(int i, const Any *elem) throw(YACS::Exception) +void ArrayAny::setEltAtRank(int i, const Any *elem) { checkTypeOf(elem); const TypeCode *subType=_type->contentType(); @@ -991,7 +991,7 @@ bool ArrayAny::operator ==(const Any& other) const return true; } -AnyPtr ArrayAny::operator[](int i) const throw(YACS::Exception) +AnyPtr ArrayAny::operator[](int i) const { const TypeCode *subType=_type->contentType(); unsigned sizePerContent=subType->getSizeInByteOfAnyReprInSeq(); @@ -1069,13 +1069,13 @@ bool StructAny::operator ==(const Any& other) const return true; } -AnyPtr StructAny::operator[](int i) const throw(YACS::Exception) +AnyPtr StructAny::operator[](int i) const { const char what[]="StructAny::operator[](int i) : Struct key are strings not integers."; throw Exception(what); } -AnyPtr StructAny::operator[](const char *key) const throw(YACS::Exception) +AnyPtr StructAny::operator[](const char *key) const { const TypeCodeStruct *typeC=(const TypeCodeStruct *)_type; char *whereToGet=_data; @@ -1093,13 +1093,13 @@ AnyPtr StructAny::operator[](const char *key) const throw(YACS::Exception) return (*iter).second->getOrBuildAnyFromZippedData(whereToGet); } -void StructAny::setEltAtRank(int i, const Any *elem) throw(YACS::Exception) +void StructAny::setEltAtRank(int i, const Any *elem) { const char what[]="Struct key are strings not integers."; throw Exception(what); } -void StructAny::setEltAtRank(const char *key, const Any *elem) throw(YACS::Exception) +void StructAny::setEltAtRank(const char *key, const Any *elem) { const TypeCodeStruct *typeC=(const TypeCodeStruct *)_type; unsigned offset; diff --git a/src/engine/Any.hxx b/src/engine/Any.hxx index f8d1e672f..31c6d3650 100644 --- a/src/engine/Any.hxx +++ b/src/engine/Any.hxx @@ -85,13 +85,13 @@ namespace YACS const TypeCode *getType() const { return _type; } //for convenience methods virtual Any *clone() const = 0; - virtual AnyPtr operator[](int i) const throw(Exception) = 0; - virtual AnyPtr operator[](const char *key) const throw(Exception) = 0; + virtual AnyPtr operator[](int i) const = 0; + virtual AnyPtr operator[](const char *key) const = 0; virtual bool operator ==(const Any& other) const = 0; - virtual int getIntValue() const throw(Exception) = 0; - virtual bool getBoolValue() const throw(Exception) = 0; - virtual double getDoubleValue() const throw(Exception) = 0; - virtual std::string getStringValue() const throw(Exception) = 0; + virtual int getIntValue() const = 0; + virtual bool getBoolValue() const = 0; + virtual double getDoubleValue() const = 0; + virtual std::string getStringValue() const = 0; // protected: #ifndef SWIG @@ -126,13 +126,13 @@ namespace YACS static AtomAny *New(T val) { return new AtomAny(val); } static AtomAny *New(char *val, Deallocator dealloc); static AtomAny *New(const std::string& val, TypeCode *type); - AnyPtr operator[](int i) const throw(Exception); - AnyPtr operator[](const char *key) const throw(Exception); + AnyPtr operator[](int i) const; + AnyPtr operator[](const char *key) const; bool operator ==(const Any& other) const; - int getIntValue() const throw(Exception); - bool getBoolValue() const throw(Exception); - double getDoubleValue() const throw(Exception); - std::string getStringValue() const throw(Exception); + int getIntValue() const; + bool getBoolValue() const; + double getDoubleValue() const; + std::string getStringValue() const; const char *getBytesValue(std::size_t& len) const; protected: void putMyReprAtPlace(char *data) const; @@ -184,18 +184,18 @@ namespace YACS class YACSLIBENGINE_EXPORT ComposedAny : public Any { public: - virtual void setEltAtRank(int i, const Any *elem) throw(Exception) = 0; - AnyPtr operator[](const char *key) const throw(Exception); + virtual void setEltAtRank(int i, const Any *elem) = 0; + AnyPtr operator[](const char *key) const; protected: ComposedAny(const ComposedAny& other); ComposedAny(TypeCode* type, bool isNew=true); protected: - void checkTypeOf(const Any *elem) const throw(Exception); + void checkTypeOf(const Any *elem) const; private://error methods called during incorrect runtime extraction - int getIntValue() const throw(Exception); - bool getBoolValue() const throw(Exception); - double getDoubleValue() const throw(Exception); - std::string getStringValue() const throw(Exception); + int getIntValue() const; + bool getBoolValue() const; + double getDoubleValue() const; + std::string getStringValue() const; }; typedef SharedPtr SequenceAnyPtr; @@ -209,8 +209,8 @@ namespace YACS unsigned int size() const { return _alloc.size(); } void pushBack(const Any *elem); bool operator ==(const Any& other) const; - void setEltAtRank(int i, const Any *elem) throw(Exception); - AnyPtr operator[](int i) const throw(Exception); + void setEltAtRank(int i, const Any *elem); + AnyPtr operator[](int i) const; Any *clone() const; template static SequenceAny *New(const std::vector& vec); @@ -250,9 +250,9 @@ namespace YACS { friend class TypeCodeArray; public: - void setEltAtRank(int i, const Any *elem) throw(Exception); + void setEltAtRank(int i, const Any *elem); bool operator ==(const Any& other) const; - AnyPtr operator[](int i) const throw(Exception); + AnyPtr operator[](int i) const; unsigned int size() const; Any *clone() const; template @@ -290,10 +290,10 @@ namespace YACS Any *clone() const; bool operator ==(const Any& other) const; static StructAny *New(TypeCodeStruct *type); - AnyPtr operator[](int i) const throw(Exception); - AnyPtr operator[](const char *key) const throw(Exception); - void setEltAtRank(int i, const Any *elem) throw(Exception); - void setEltAtRank(const char *key, const Any *elem) throw(Exception); + AnyPtr operator[](int i) const; + AnyPtr operator[](const char *key) const; + void setEltAtRank(int i, const Any *elem); + void setEltAtRank(const char *key, const Any *elem); protected: void putMyReprAtPlace(char *data) const; static void putReprAtPlace(char *data, const char *src, const TypeCodeStruct *type, bool deepCpy); diff --git a/src/engine/AnyInputPort.cxx b/src/engine/AnyInputPort.cxx index 6fa9acba5..b29ec176d 100644 --- a/src/engine/AnyInputPort.cxx +++ b/src/engine/AnyInputPort.cxx @@ -125,7 +125,7 @@ std::string AnyInputPort::getAsString() return getRuntime()->convertNeutralAsString(edGetType(),_value); } -void AnyInputPort::put(const void *data) throw(ConversionException) +void AnyInputPort::put(const void *data) { put((Any *)data); } diff --git a/src/engine/AnyInputPort.hxx b/src/engine/AnyInputPort.hxx index 1791e3e8b..fca59fef0 100644 --- a/src/engine/AnyInputPort.hxx +++ b/src/engine/AnyInputPort.hxx @@ -45,7 +45,7 @@ namespace YACS void *get() const; virtual std::string getAsString(); virtual bool isEmpty(); - void put(const void *data) throw(ConversionException); + void put(const void *data); InputPort *clone(Node *newHelder) const; std::string dump(); virtual std::string typeName() {return "YACS__ENGINE__AnyInputPort";} diff --git a/src/engine/AnyOutputPort.cxx b/src/engine/AnyOutputPort.cxx index 04affa2f0..581daaaf8 100644 --- a/src/engine/AnyOutputPort.cxx +++ b/src/engine/AnyOutputPort.cxx @@ -61,12 +61,12 @@ OutputPort *AnyOutputPort::clone(Node *newHelder) const return new AnyOutputPort(*this,newHelder); } -void AnyOutputPort::put(const void *data) throw(ConversionException) +void AnyOutputPort::put(const void *data) { put((YACS::ENGINE::Any *)data); } -void AnyOutputPort::put(YACS::ENGINE::Any *data) throw(ConversionException) +void AnyOutputPort::put(YACS::ENGINE::Any *data) { setValue(data); OutputPort::put(data); diff --git a/src/engine/AnyOutputPort.hxx b/src/engine/AnyOutputPort.hxx index f61746808..481ae36e4 100644 --- a/src/engine/AnyOutputPort.hxx +++ b/src/engine/AnyOutputPort.hxx @@ -37,8 +37,8 @@ namespace YACS AnyOutputPort(const AnyOutputPort& other, Node *newHelder); virtual ~AnyOutputPort(); virtual void setValue(Any *data); - virtual void put(const void *data) throw(ConversionException); - void put(Any *data) throw(ConversionException); + virtual void put(const void *data); + void put(Any *data); //! get the current dispatched value for update port value Any* getValue() const { return _data; } virtual std::string getAsString(); diff --git a/src/engine/Bloc.cxx b/src/engine/Bloc.cxx index fdc5d16c5..84a3f9390 100644 --- a/src/engine/Bloc.cxx +++ b/src/engine/Bloc.cxx @@ -173,7 +173,7 @@ void Bloc::exUpdateState() * If node name already used in bloc, throw exception. * Publish inputPorts in current bloc and ancestors. */ -bool Bloc::edAddChild(Node *node) throw(YACS::Exception) +bool Bloc::edAddChild(Node *node) { if(isNodeAlreadyAggregated(node)) { @@ -217,7 +217,7 @@ bool Bloc::edAddChild(Node *node) throw(YACS::Exception) * @exception If 'node' is NOT the son of 'this'. */ -void Bloc::edRemoveChild(Node *node) throw(YACS::Exception) +void Bloc::edRemoveChild(Node *node) { StaticDefinedComposedNode::edRemoveChild(node); list::iterator iter=find(_setOfNode.begin(),_setOfNode.end(),node); @@ -276,7 +276,7 @@ std::vector< std::list > Bloc::splitIntoIndependantGraph() const return ret; } -Node *Bloc::getChildByShortName(const std::string& name) const throw(YACS::Exception) +Node *Bloc::getChildByShortName(const std::string& name) const { for (list::const_iterator iter = _setOfNode.begin(); iter != _setOfNode.end(); iter++) if ((*iter)->getName() == name) @@ -335,7 +335,7 @@ bool insertNodeChildrenInSet(Node *node, std::set& nodeSet) * \b WARNING : When using this method 'node' has to be checked in order to be part of direct children of 'this'. * */ -void Bloc::checkNoCyclePassingThrough(Node *node) throw(YACS::Exception) +void Bloc::checkNoCyclePassingThrough(Node *node) { set currentNodesToTest; //don't insert node to test in set. diff --git a/src/engine/Bloc.hxx b/src/engine/Bloc.hxx index da46d314d..7c79c19cd 100644 --- a/src/engine/Bloc.hxx +++ b/src/engine/Bloc.hxx @@ -52,12 +52,12 @@ namespace YACS void getReadyTasks(std::vector& tasks); void exUpdateState(); //Node* DISOWNnode is a SWIG notation to indicate that the ownership of the node is transfered to C++ - bool edAddChild(Node *DISOWNnode) throw(Exception); - void edRemoveChild(Node *node) throw(Exception); + bool edAddChild(Node *DISOWNnode) ; + void edRemoveChild(Node *node) ; std::list getChildren() const { return _setOfNode; } std::list edGetDirectDescendants() const { return _setOfNode; } std::vector< std::list > splitIntoIndependantGraph() const; - Node *getChildByShortName(const std::string& name) const throw(Exception); + Node *getChildByShortName(const std::string& name) const ; virtual void writeDot(std::ostream &os) const; void accept(Visitor *visitor); template @@ -75,7 +75,7 @@ namespace YACS bool areAllSubNodesFinished() const; bool areAllSubNodesDone() const; bool isNameAlreadyUsed(const std::string& name) const; - void checkNoCyclePassingThrough(Node *node) throw(Exception); + void checkNoCyclePassingThrough(Node *node) ; std::vector< std::pair > getSetOfInternalCFLinks() const; YACS::Event updateStateOnFinishedEventFrom(Node *node); YACS::Event updateStateOnFailedEventFrom(Node *node, const Executor *execInst); diff --git a/src/engine/ComposedNode.cxx b/src/engine/ComposedNode.cxx index ccb4f7917..70ab5b304 100644 --- a/src/engine/ComposedNode.cxx +++ b/src/engine/ComposedNode.cxx @@ -186,7 +186,7 @@ DeploymentTree ComposedNode::getDeploymentTree() const /*! * \param deep if \b true a deep check is perfomed. Typically has to be called by an executor before any attempt to launch an execution. */ -DeploymentTree ComposedNode::checkDeploymentTree(bool deep) const throw(YACS::Exception) +DeploymentTree ComposedNode::checkDeploymentTree(bool deep) const { DeploymentTree ret; list< ElementaryNode * > tasks=getRecursiveConstituents(); @@ -270,7 +270,7 @@ void ComposedNode::notifyFrom(const Task *sender, //* I : task emitting event * \return true if a new link has been created, false otherwise. */ -bool ComposedNode::edAddLink(OutPort *start, InPort *end) throw(YACS::Exception) +bool ComposedNode::edAddLink(OutPort *start, InPort *end) { DEBTRACE("ComposedNode::edAddLink"); set represented; @@ -330,7 +330,7 @@ bool ComposedNode::edAddLink(OutPort *start, InPort *end) throw(YACS::Exception) * \param end : the InPort to connect * \return true if a new link has been created, false otherwise. */ -bool ComposedNode::edAddDFLink(OutPort *start, InPort *end) throw(YACS::Exception) +bool ComposedNode::edAddDFLink(OutPort *start, InPort *end) { Node* n1=start->getNode(); Node* n2=end->getNode(); @@ -384,7 +384,7 @@ bool ComposedNode::edAddDFLink(OutPort *start, InPort *end) throw(YACS::Exceptio * supporting it. * \return true if a new link has been created, false otherwise. */ -bool ComposedNode::edAddLink(OutGate *start, InGate *end) throw(YACS::Exception) +bool ComposedNode::edAddLink(OutGate *start, InGate *end) { Node* n1=start->getNode(); Node* n2=end->getNode(); @@ -418,13 +418,13 @@ bool ComposedNode::edAddLink(OutGate *start, InGate *end) throw(YACS::Exception) /*! * Add a controlflow link between two nodes by calling edAddLink on their control ports */ -bool ComposedNode::edAddCFLink(Node *nodeS, Node *nodeE) throw(YACS::Exception) +bool ComposedNode::edAddCFLink(Node *nodeS, Node *nodeE) { return edAddLink(nodeS->getOutGate(),nodeE->getInGate()); } //! Remove a controlflow link. -void ComposedNode::edRemoveCFLink(Node *nodeS, Node *nodeE) throw(YACS::Exception) +void ComposedNode::edRemoveCFLink(Node *nodeS, Node *nodeE) { edRemoveLink(nodeS->getOutGate(),nodeE->getInGate()); } @@ -438,7 +438,7 @@ void ComposedNode::edRemoveCFLink(Node *nodeS, Node *nodeE) throw(YACS::Exceptio * implies DF/DS gateway. */ -void ComposedNode::edRemoveLink(OutPort *start, InPort *end) throw(YACS::Exception) +void ComposedNode::edRemoveLink(OutPort *start, InPort *end) { if(!start->isAlreadyLinkedWith(end)) throw Exception("ComposedNode::edRemoveLink : unexisting link"); @@ -520,7 +520,7 @@ void ComposedNode::edRemoveLink(OutPort *start, InPort *end) throw(YACS::Excepti } //! Remove a controlflow link. -void ComposedNode::edRemoveLink(OutGate *start, InGate *end) throw(YACS::Exception) +void ComposedNode::edRemoveLink(OutGate *start, InGate *end) { ComposedNode* father=checkHavingCommonFather(start->getNode(),end->getNode()); if(father!=this) @@ -528,13 +528,13 @@ void ComposedNode::edRemoveLink(OutGate *start, InGate *end) throw(YACS::Excepti start->edRemoveInGate(end); } -bool ComposedNode::edAddChild(Node *DISOWNnode) throw(YACS::Exception) +bool ComposedNode::edAddChild(Node *DISOWNnode) { return false; // --- reimplemented in derived classes } //! Remove a child node. -void ComposedNode::edRemoveChild(Node *node) throw(YACS::Exception) +void ComposedNode::edRemoveChild(Node *node) { if(!node) return; @@ -559,7 +559,7 @@ void ComposedNode::edRemoveChild(Node *node) throw(YACS::Exception) * separator was not found). */ bool ComposedNode::splitNamesBySep(const std::string& globalName, const char separator[], - std::string& firstPart, std::string& lastPart, bool priority) throw(YACS::Exception) + std::string& firstPart, std::string& lastPart, bool priority) { const string delims(separator); string portName, nodeName; @@ -612,7 +612,7 @@ std::vector< std::pair > ComposedNode::getSetOfLinksLeaving return ret; } -void ComposedNode::checkConsistency(LinkInfo& info) const throw(YACS::Exception) +void ComposedNode::checkConsistency(LinkInfo& info) const { info.clearAll(); info.setPointOfView((ComposedNode *)this); @@ -659,7 +659,7 @@ void ComposedNode::checkConsistency(LinkInfo& info) const throw(YACS::Exception) * This method check that G1 <- G2 <- G3 <- G1 does not happened. * Typically called by methods that set a hierarchy (Bloc::edAddChild, Loop::edSetNode, ...). */ -void ComposedNode::checkNoCrossHierachyWith(Node *node) const throw(YACS::Exception) +void ComposedNode::checkNoCrossHierachyWith(Node *node) const { ComposedNode *nodeC=dynamic_cast(node); if(!nodeC) @@ -714,7 +714,7 @@ Node *ComposedNode::getLowestNodeDealingAll(const std::list& ports) c /*! * call it only for 'starts' to 'end' links \b DEALED by 'this'. */ -void ComposedNode::checkLinksCoherenceRegardingControl(const std::vector& starts, InputPort *end, LinkInfo& info) const throw(YACS::Exception) +void ComposedNode::checkLinksCoherenceRegardingControl(const std::vector& starts, InputPort *end, LinkInfo& info) const { map < ComposedNode *, list, SortHierarc > outputs;//forward link classical vector outputsCross;//forward link cross @@ -924,7 +924,7 @@ void ComposedNode::edDisconnectAllLinksWithMe() } } -ComposedNode *ComposedNode::getRootNode() const throw(YACS::Exception) +ComposedNode *ComposedNode::getRootNode() const { if(!_father) return (ComposedNode *)this; @@ -965,7 +965,7 @@ Node *ComposedNode::isInMyDescendance(Node *nodeToTest) const return 0; } -string ComposedNode::getChildName(const Node* node) const throw(YACS::Exception) +string ComposedNode::getChildName(const Node* node) const { string nodeName=node->getQualifiedName(); if (!isNodeAlreadyAggregated(node)) @@ -996,7 +996,7 @@ std::string ComposedNode::getMyQualifiedName(const Node *directSon) const return directSon->getName(); } -Node *ComposedNode::getChildByName(const std::string& name) const throw(YACS::Exception) +Node *ComposedNode::getChildByName(const std::string& name) const { string potentiallyDirectSonName, remainsPath; bool forwardNeeded=ComposedNode::splitNamesBySep(name, SEP_CHAR_BTW_LEVEL, @@ -1014,7 +1014,7 @@ Node *ComposedNode::getChildByName(const std::string& name) const throw(YACS::Ex * \exception Exception : If 'nodeToTest' is NOT in descendance of 'this' AND not equal to 'this' * \param nodeToTest : the node to check */ -void ComposedNode::checkInMyDescendance(Node *nodeToTest) const throw(YACS::Exception) +void ComposedNode::checkInMyDescendance(Node *nodeToTest) const { const char whatC[]=" is not the descendance of node "; if(nodeToTest==0) @@ -1047,7 +1047,7 @@ void ComposedNode::checkInMyDescendance(Node *nodeToTest) const throw(YACS::Exce * \return The lowest common ancestor if it exists. * */ -ComposedNode *ComposedNode::getLowestCommonAncestor(Node *node1, Node *node2) throw(YACS::Exception) +ComposedNode *ComposedNode::getLowestCommonAncestor(Node *node1, Node *node2) { const char what[]="The two nodes do not share the same genealogy"; if(node1==0 || node2==0) @@ -1197,12 +1197,12 @@ list ComposedNode::getProgressWeight() const * get the input port name used by the current node, recursively built with children names. */ -string ComposedNode::getInPortName(const InPort * inPort) const throw(YACS::Exception) +string ComposedNode::getInPortName(const InPort * inPort) const { return getPortName(inPort); } -string ComposedNode::getOutPortName(const OutPort *outPort) const throw(YACS::Exception) +string ComposedNode::getOutPortName(const OutPort *outPort) const { return getPortName(outPort); } @@ -1273,7 +1273,7 @@ list ComposedNode::getSetOfOutputDataStreamPort() const return ret; } -OutPort *ComposedNode::getOutPort(const std::string& name) const throw(YACS::Exception) +OutPort *ComposedNode::getOutPort(const std::string& name) const { string portName, nodeName; if(splitNamesBySep(name,Node::SEP_CHAR_IN_PORT,nodeName,portName,false)) @@ -1294,7 +1294,7 @@ OutPort *ComposedNode::getOutPort(const std::string& name) const throw(YACS::Exc * and so the leaf of type ElementaryNode aggregating * this InputPort is directly invoked. */ -InputPort * ComposedNode::getInputPort(const std::string& name) const throw(YACS::Exception) +InputPort * ComposedNode::getInputPort(const std::string& name) const { try { return Node::getInputPort(name); @@ -1319,7 +1319,7 @@ InputPort * ComposedNode::getInputPort(const std::string& name) const throw(YACS * Contrary to YACS::ENGINE::ComposedNode::getInputPort, this method is recursive and go * down hierarchy step by step to complete its work. */ -OutputPort * ComposedNode::getOutputPort(const std::string& name) const throw(YACS::Exception) +OutputPort * ComposedNode::getOutputPort(const std::string& name) const { string portName, nodeName; if(splitNamesBySep(name,Node::SEP_CHAR_IN_PORT,nodeName,portName,false)) @@ -1334,7 +1334,7 @@ OutputPort * ComposedNode::getOutputPort(const std::string& name) const throw(YA } } -InputDataStreamPort *ComposedNode::getInputDataStreamPort(const std::string& name) const throw(YACS::Exception) +InputDataStreamPort *ComposedNode::getInputDataStreamPort(const std::string& name) const { string portName, nodeName; if(splitNamesBySep(name,Node::SEP_CHAR_IN_PORT,nodeName,portName,true)) @@ -1349,7 +1349,7 @@ InputDataStreamPort *ComposedNode::getInputDataStreamPort(const std::string& nam } } -OutputDataStreamPort *ComposedNode::getOutputDataStreamPort(const std::string& name) const throw(YACS::Exception) +OutputDataStreamPort *ComposedNode::getOutputDataStreamPort(const std::string& name) const { string portName, nodeName; if(splitNamesBySep(name,Node::SEP_CHAR_IN_PORT,nodeName,portName,true)) @@ -1445,7 +1445,7 @@ YACS::Event ComposedNode::updateStateOnFailedEventFrom(Node *node, const Executo } void ComposedNode::checkLinkPossibility(OutPort *start, const std::list& pointsOfViewStart, - InPort *end, const std::list& pointsOfViewEnd) throw(YACS::Exception) + InPort *end, const std::list& pointsOfViewEnd) { if((dynamic_cast(start) || dynamic_cast(end)) && (dynamic_cast(start) || dynamic_cast(end))) @@ -1469,19 +1469,19 @@ void ComposedNode::buildDelegateOf(std::pair& port, InPort { } -void ComposedNode::getDelegateOf(InPort * & port, OutPort *initialStart, const std::list& pointsOfView) throw(YACS::Exception) +void ComposedNode::getDelegateOf(InPort * & port, OutPort *initialStart, const std::list& pointsOfView) { } -void ComposedNode::getDelegateOf(std::pair& port, InPort *finalTarget, const std::list& pointsOfView) throw(YACS::Exception) +void ComposedNode::getDelegateOf(std::pair& port, InPort *finalTarget, const std::list& pointsOfView) { } -void ComposedNode::releaseDelegateOf(InPort * & port, OutPort *initialStart, const std::list& pointsOfView) throw(YACS::Exception) +void ComposedNode::releaseDelegateOf(InPort * & port, OutPort *initialStart, const std::list& pointsOfView) { } -void ComposedNode::releaseDelegateOf(OutPort *portDwn, OutPort *portUp, InPort *finalTarget, const std::list& pointsOfView) throw(YACS::Exception) +void ComposedNode::releaseDelegateOf(OutPort *portDwn, OutPort *portUp, InPort *finalTarget, const std::list& pointsOfView) { } @@ -1589,7 +1589,7 @@ std::string ComposedNode::getErrorReport() -void ComposedNode::checkBasicConsistency() const throw(YACS::Exception) +void ComposedNode::checkBasicConsistency() const { DEBTRACE("ComposedNode::checkBasicConsistency"); std::list::const_iterator iter; diff --git a/src/engine/ComposedNode.hxx b/src/engine/ComposedNode.hxx index 68f545694..355ddf809 100644 --- a/src/engine/ComposedNode.hxx +++ b/src/engine/ComposedNode.hxx @@ -61,20 +61,20 @@ namespace YACS std::string getName() const; std::string getTaskName(Task *task) const; DeploymentTree getDeploymentTree() const; - DeploymentTree checkDeploymentTree(bool deep) const throw(Exception); + DeploymentTree checkDeploymentTree(bool deep) const ; std::vector getNextTasks(bool& isMore); virtual bool isPlacementPredictableB4Run() const = 0; void notifyFrom(const Task *sender, YACS::Event event, const Executor *execInst); - bool edAddLink(OutPort *start, InPort *end) throw(Exception); - virtual bool edAddDFLink(OutPort *start, InPort *end) throw(Exception); + bool edAddLink(OutPort *start, InPort *end) ; + virtual bool edAddDFLink(OutPort *start, InPort *end) ; //Node* DISOWNnode is a SWIG notation to indicate that the ownership of the node is transfered to C++ - virtual bool edAddChild(Node *DISOWNnode) throw(Exception); - virtual void edRemoveChild(Node *node) throw(Exception); - bool edAddLink(OutGate *start, InGate *end) throw(Exception); - bool edAddCFLink(Node *nodeS, Node *nodeE) throw(Exception); - void edRemoveCFLink(Node *nodeS, Node *nodeE) throw(Exception); - void edRemoveLink(OutPort *start, InPort *end) throw(Exception); - void edRemoveLink(OutGate *start, InGate *end) throw(Exception); + virtual bool edAddChild(Node *DISOWNnode) ; + virtual void edRemoveChild(Node *node) ; + bool edAddLink(OutGate *start, InGate *end) ; + bool edAddCFLink(Node *nodeS, Node *nodeE) ; + void edRemoveCFLink(Node *nodeS, Node *nodeE) ; + void edRemoveLink(OutPort *start, InPort *end) ; + void edRemoveLink(OutGate *start, InGate *end) ; virtual bool isRepeatedUnpredictablySeveralTimes() const { return false; } virtual bool isLoop() const { return false; } virtual std::list edGetDirectDescendants() const = 0; @@ -83,8 +83,8 @@ namespace YACS std::list getAllRecursiveNodes(); virtual std::list getAllRecursiveConstituents(); // first implementation std::list getProgressWeight() const; - std::string getInPortName(const InPort *) const throw (Exception); - std::string getOutPortName(const OutPort *) const throw (Exception); + std::string getInPortName(const InPort *) const ; + std::string getOutPortName(const OutPort *) const ; // int getNumberOfInputPorts() const; int getNumberOfOutputPorts() const; @@ -96,28 +96,28 @@ namespace YACS std::set getAllInPortsComingFromOutsideOfCurrentScope() const; std::list getSetOfInputDataStreamPort() const; std::list getSetOfOutputDataStreamPort() const; - OutPort *getOutPort(const std::string& name) const throw(Exception); - InputPort *getInputPort(const std::string& name) const throw(Exception); - OutputPort *getOutputPort(const std::string& name) const throw(Exception); - InputDataStreamPort *getInputDataStreamPort(const std::string& name) const throw(Exception); - OutputDataStreamPort *getOutputDataStreamPort(const std::string& name) const throw(Exception); + OutPort *getOutPort(const std::string& name) const ; + InputPort *getInputPort(const std::string& name) const ; + OutputPort *getOutputPort(const std::string& name) const ; + InputDataStreamPort *getInputDataStreamPort(const std::string& name) const ; + OutputDataStreamPort *getOutputDataStreamPort(const std::string& name) const ; std::vector< std::pair > getSetOfInternalLinks() const; virtual std::vector< std::pair > getSetOfLinksLeavingCurrentScope() const; - void checkConsistency(LinkInfo& info) const throw(Exception); + void checkConsistency(LinkInfo& info) const ; virtual std::vector< std::pair > getSetOfLinksComingInCurrentScope() const; virtual std::string typeName() {return "YACS__ENGINE__ComposedNode";} virtual void edUpdateState(); - virtual void checkBasicConsistency() const throw(Exception); + virtual void checkBasicConsistency() const ; virtual std::string getErrorReport(); // - ComposedNode *getRootNode() const throw(Exception); + ComposedNode *getRootNode() const ; bool isNodeAlreadyAggregated(const Node *node) const; virtual bool isNameAlreadyUsed(const std::string& name) const; Node *isInMyDescendance(Node *nodeToTest) const; - std::string getChildName(const Node* node) const throw(Exception); + std::string getChildName(const Node* node) const ; virtual std::string getMyQualifiedName(const Node *directSon) const; - Node *getChildByName(const std::string& name) const throw(Exception); - static ComposedNode *getLowestCommonAncestor(Node *node1, Node *node2) throw(Exception); + Node *getChildByName(const std::string& name) const ; + static ComposedNode *getLowestCommonAncestor(Node *node1, Node *node2) ; static std::string getLowestCommonAncestorStr(const std::string& node1, const std::string& node2); void loaded(); void connected(); @@ -135,31 +135,31 @@ namespace YACS protected: void edDisconnectAllLinksWithMe(); static bool splitNamesBySep(const std::string& globalName, const char separator[], - std::string& firstPart, std::string& lastPart, bool priority) throw(Exception); - virtual Node *getChildByShortName(const std::string& name) const throw(Exception) = 0; + std::string& firstPart, std::string& lastPart, bool priority) ; + virtual Node *getChildByShortName(const std::string& name) const = 0; YACS::Event updateStateFrom(Node *node, YACS::Event event, const Executor *execInst);//update the state of this. Precondition : node->_father == this virtual YACS::Event updateStateOnStartEventFrom(Node *node);//transition 3 doc P.R virtual YACS::Event updateStateOnFinishedEventFrom(Node *node) = 0;//transition 9 doc P.R. virtual YACS::Event updateStateOnFailedEventFrom(Node *node, const Executor *execInst);//transition 9 doc P.R. virtual void checkLinkPossibility(OutPort *start, const std::list& pointsOfViewStart, - InPort *end, const std::list& pointsOfViewEnd) throw(Exception); + InPort *end, const std::list& pointsOfViewEnd) ; virtual void buildDelegateOf(InPort * & port, OutPort *initialStart, const std::list& pointsOfView); virtual void buildDelegateOf(std::pair& port, InPort *finalTarget, const std::list& pointsOfView); - virtual void getDelegateOf(InPort * & port, OutPort *initialStart, const std::list& pointsOfView) throw(Exception); - virtual void getDelegateOf(std::pair& port, InPort *finalTarget, const std::list& pointsOfView) throw(Exception); - virtual void releaseDelegateOf(InPort * & port, OutPort *initialStart, const std::list& pointsOfView) throw(Exception); - virtual void releaseDelegateOf(OutPort *portDwn, OutPort *portUp, InPort *finalTarget, const std::list& pointsOfView) throw(Exception); - virtual void checkNoCyclePassingThrough(Node *node) throw(Exception) = 0; - void checkInMyDescendance(Node *nodeToTest) const throw(Exception); + virtual void getDelegateOf(InPort * & port, OutPort *initialStart, const std::list& pointsOfView) ; + virtual void getDelegateOf(std::pair& port, InPort *finalTarget, const std::list& pointsOfView) ; + virtual void releaseDelegateOf(InPort * & port, OutPort *initialStart, const std::list& pointsOfView) ; + virtual void releaseDelegateOf(OutPort *portDwn, OutPort *portUp, InPort *finalTarget, const std::list& pointsOfView) ; + virtual void checkNoCyclePassingThrough(Node *node) = 0; + void checkInMyDescendance(Node *nodeToTest) const ; template - std::string getPortName(const PORT * port) const throw (Exception); + std::string getPortName(const PORT * port) const ; //For CF Computations - void checkNoCrossHierachyWith(Node *node) const throw (Exception); + void checkNoCrossHierachyWith(Node *node) const ; virtual void performCFComputations(LinkInfo& info) const; virtual void destructCFComputations(LinkInfo& info) const; Node *getLowestNodeDealingAll(const std::list& ports) const; void checkLinksCoherenceRegardingControl(const std::vector& starts, - InputPort *end, LinkInfo& info) const throw(Exception); + InputPort *end, LinkInfo& info) const ; virtual void checkControlDependancy(OutPort *start, InPort *end, bool cross, std::map < ComposedNode *, std::list < OutPort * >, SortHierarc >& fw, std::vector& fwCross, @@ -175,7 +175,7 @@ namespace YACS }; template - std::string ComposedNode::getPortName(const PORT * port) const throw (Exception) + std::string ComposedNode::getPortName(const PORT * port) const { Node *node = port->getNode(); std::string portName = port->getName(); diff --git a/src/engine/ConditionInputPort.cxx b/src/engine/ConditionInputPort.cxx index d5dc9b35b..779c9e9c1 100644 --- a/src/engine/ConditionInputPort.cxx +++ b/src/engine/ConditionInputPort.cxx @@ -99,7 +99,7 @@ void *ConditionInputPort::get() const return (void *)_value; } -void ConditionInputPort::put(const void *data) throw(ConversionException) +void ConditionInputPort::put(const void *data) { put((Any*)data); } @@ -111,7 +111,7 @@ void ConditionInputPort::releaseData() _value=nullptr; } -void ConditionInputPort::put(Any *data) throw(ConversionException) +void ConditionInputPort::put(Any *data) { ConditionInputPort::releaseData(); _value=data; diff --git a/src/engine/ConditionInputPort.hxx b/src/engine/ConditionInputPort.hxx index d96918c06..d6d840d78 100644 --- a/src/engine/ConditionInputPort.hxx +++ b/src/engine/ConditionInputPort.hxx @@ -45,8 +45,8 @@ namespace YACS void edNotifyReferencedBy(OutPort *fromPort, bool isLoopProof) override; void edNotifyDereferencedBy(OutPort *fromPort); void *get() const; - virtual void put(const void *data) throw(ConversionException); - void put(Any *data) throw(ConversionException); + virtual void put(const void *data); + void put(Any *data); void releaseData() override; std::string dump(); virtual std::string getAsString(); diff --git a/src/engine/Container.hxx b/src/engine/Container.hxx index 51d2e2b9e..3c752a543 100644 --- a/src/engine/Container.hxx +++ b/src/engine/Container.hxx @@ -50,7 +50,7 @@ namespace YACS //Execution only methods virtual std::string getDiscreminantStrOfThis(const Task *askingNode) const; virtual bool isAlreadyStarted(const Task *askingNode) const = 0; - virtual void start(const Task *askingNode) throw(Exception) = 0; + virtual void start(const Task *askingNode) = 0; virtual std::string getPlacementId(const Task *askingNode) const = 0; virtual std::string getFullPlacementId(const Task *askingNode) const = 0; //Edition only methods @@ -64,7 +64,7 @@ namespace YACS virtual Container *clone() const = 0; virtual Container *cloneAlways() const = 0; virtual bool isSupportingRTODefNbOfComp() const; - virtual void checkCapabilityToDealWith(const ComponentInstance *inst) const throw(Exception) = 0; + virtual void checkCapabilityToDealWith(const ComponentInstance *inst) const = 0; virtual void setProperty(const std::string& name,const std::string& value) = 0; virtual std::string getProperty(const std::string& name) const = 0; virtual void clearProperties() = 0; diff --git a/src/engine/DataPort.hxx b/src/engine/DataPort.hxx index 4ce158419..744f845d8 100644 --- a/src/engine/DataPort.hxx +++ b/src/engine/DataPort.hxx @@ -58,7 +58,7 @@ namespace YACS //! returns type of channel the port will use for data exchange on runtime : DATAFLOW or DATASTREAM. virtual TypeOfChannel getTypeOfChannel() const = 0; bool isDifferentTypeOf(const DataPort *other) const; - virtual void edRemoveAllLinksLinkedWithMe() throw(Exception) = 0; + virtual void edRemoveAllLinksLinkedWithMe() = 0; virtual std::string typeName() {return "YACS__ENGINE__DataPort";} virtual std::string getAsString(); public: diff --git a/src/engine/DynParaLoop.cxx b/src/engine/DynParaLoop.cxx index fd1b2b420..77f44e2b7 100644 --- a/src/engine/DynParaLoop.cxx +++ b/src/engine/DynParaLoop.cxx @@ -138,7 +138,7 @@ Node * DynParaLoop::edSetFinalizeNode(Node * node) * \param end : the InPort to connect * \return true if a new link has been created, false otherwise. */ -bool DynParaLoop::edAddDFLink(OutPort *start, InPort *end) throw(YACS::Exception) +bool DynParaLoop::edAddDFLink(OutPort *start, InPort *end) { return edAddLink(start,end); } @@ -195,7 +195,7 @@ std::list DynParaLoop::getLocalOutputPorts() const return ret; } -OutPort *DynParaLoop::getOutPort(const std::string& name) const throw(YACS::Exception) +OutPort *DynParaLoop::getOutPort(const std::string& name) const { if (name == NAME_OF_SPLITTED_SEQ_OUT || name == OLD_NAME_OF_SPLITTED_SEQ_OUT) return (OutPort *)&_splittedPort; @@ -203,7 +203,7 @@ OutPort *DynParaLoop::getOutPort(const std::string& name) const throw(YACS::Exce } -OutputPort *DynParaLoop::getOutputPort(const std::string& name) const throw(YACS::Exception) +OutputPort *DynParaLoop::getOutputPort(const std::string& name) const { if (name == NAME_OF_SPLITTED_SEQ_OUT || name == OLD_NAME_OF_SPLITTED_SEQ_OUT) return (OutputPort *)&_splittedPort; @@ -242,7 +242,7 @@ Node * DynParaLoop::edRemoveFinalizeNode() return removeNode(_finalizeNode); } -void DynParaLoop::edRemoveChild(Node *node) throw(YACS::Exception) +void DynParaLoop::edRemoveChild(Node *node) { ComposedNode::edRemoveChild(node); if(node==_node) @@ -254,7 +254,7 @@ void DynParaLoop::edRemoveChild(Node *node) throw(YACS::Exception) modified(); } -bool DynParaLoop::edAddChild(Node *DISOWNnode) throw(YACS::Exception) +bool DynParaLoop::edAddChild(Node *DISOWNnode) { return edSetNode(DISOWNnode); } @@ -280,7 +280,7 @@ std::list DynParaLoop::getSetOfInputPort() const return ret; } -InputPort *DynParaLoop::getInputPort(const std::string& name) const throw(YACS::Exception) +InputPort *DynParaLoop::getInputPort(const std::string& name) const { if(_nbOfBranches->isMyName(name)) return _nbOfBranches->getPort(); @@ -296,7 +296,7 @@ std::list DynParaLoop::getLocalInputPorts() const return ret; } -unsigned DynParaLoop::getNumberOfBranchesCreatedDyn() const throw(YACS::Exception) +unsigned DynParaLoop::getNumberOfBranchesCreatedDyn() const { if(_execNodes.empty()) throw Exception("ForEachLoop::getNumberOfBranches : No branches created dynamically ! - ForEachLoop needs to run or to be runned to call getNumberOfBranches"); @@ -304,7 +304,7 @@ unsigned DynParaLoop::getNumberOfBranchesCreatedDyn() const throw(YACS::Exceptio return _execNodes.size(); } -Node *DynParaLoop::getChildByShortName(const std::string& name) const throw(YACS::Exception) +Node *DynParaLoop::getChildByShortName(const std::string& name) const { if (_node && name == _node->getName()) return _node; @@ -316,7 +316,7 @@ Node *DynParaLoop::getChildByShortName(const std::string& name) const throw(YACS throw Exception(what); } -Node *DynParaLoop::getChildByNameExec(const std::string& name, unsigned id) const throw(YACS::Exception) +Node *DynParaLoop::getChildByNameExec(const std::string& name, unsigned id) const { if(id>=getNumberOfBranchesCreatedDyn()) throw Exception("ForEachLoop::getChildByNameExec : invalid id - too large compared with dynamically created branches."); @@ -519,7 +519,7 @@ void DynParaLoop::checkControlDependancy(OutPort *start, InPort *end, bool cross } void DynParaLoop::checkLinkPossibility(OutPort *start, const std::list& pointsOfViewStart, - InPort *end, const std::list& pointsOfViewEnd) throw(YACS::Exception) + InPort *end, const std::list& pointsOfViewEnd) { ComposedNode::checkLinkPossibility(start, pointsOfViewStart, end, pointsOfViewEnd); Node * startNode = isInMyDescendance(start->getNode()); @@ -575,7 +575,7 @@ InputPort *DynParaLoop::getDynInputPortByAbsName(int branchNb, const std::string return 0; } -void DynParaLoop::checkBasicConsistency() const throw(YACS::Exception) +void DynParaLoop::checkBasicConsistency() const { DEBTRACE("DynParaLoop::checkBasicConsistency"); ComposedNode::checkBasicConsistency(); diff --git a/src/engine/DynParaLoop.hxx b/src/engine/DynParaLoop.hxx index 8e58bd499..424a1ccd9 100644 --- a/src/engine/DynParaLoop.hxx +++ b/src/engine/DynParaLoop.hxx @@ -78,7 +78,7 @@ namespace YACS Node *edSetNode(Node *DISOWNnode); Node *edSetInitNode(Node *DISOWNnode); Node *edSetFinalizeNode(Node *DISOWNnode); - virtual bool edAddDFLink(OutPort *start, InPort *end) throw(Exception); + virtual bool edAddDFLink(OutPort *start, InPort *end) ; void init(bool start=true); InputPort *edGetNbOfBranchesPort() { return _nbOfBranches->getPort(); } int getNumberOfInputPorts() const; @@ -88,27 +88,27 @@ namespace YACS std::list getSetOfOutputPort() const; std::list getLocalOutputPorts() const; OutputPort *edGetSamplePort() { return &_splittedPort; } - OutPort *getOutPort(const std::string& name) const throw(Exception); - InputPort *getInputPort(const std::string& name) const throw(Exception); - OutputPort *getOutputPort(const std::string& name) const throw(Exception); + OutPort *getOutPort(const std::string& name) const ; + InputPort *getInputPort(const std::string& name) const ; + OutputPort *getOutputPort(const std::string& name) const ; //! For the moment false is returned : impovement about it coming soon. bool isPlacementPredictableB4Run() const; - void edRemoveChild(Node *node) throw(Exception); + void edRemoveChild(Node *node) ; bool isLoop() const override { return true; } - virtual bool edAddChild(Node *DISOWNnode) throw(Exception); + virtual bool edAddChild(Node *DISOWNnode) ; std::list edGetDirectDescendants() const; std::list getSetOfInputPort() const; std::list getLocalInputPorts() const; - unsigned getNumberOfBranchesCreatedDyn() const throw(Exception); - Node *getChildByShortName(const std::string& name) const throw(Exception); - Node *getChildByNameExec(const std::string& name, unsigned id) const throw(Exception); + unsigned getNumberOfBranchesCreatedDyn() const ; + Node *getChildByShortName(const std::string& name) const ; + Node *getChildByNameExec(const std::string& name, unsigned id) const ; std::vector getNodes() const { return _execNodes; } // need to use in GUI part for adding observers for clone nodes ComplexWeight * getWeight(); void setWeight(double loopWeight); void getWeightRegardingDPL(ComplexWeight *weight) {weight->addWeight(getWeight());} bool isMultiplicitySpecified(unsigned& value) const; void forceMultiplicity(unsigned value); - virtual void checkBasicConsistency() const throw(Exception); + virtual void checkBasicConsistency() const ; virtual std::string getErrorReport(); void accept(Visitor *visitor); Node * getInitNode(); @@ -127,7 +127,7 @@ namespace YACS std::map< ComposedNode *, std::list < OutPort *>, SortHierarc >& bw, LinkInfo& info) const; virtual void checkLinkPossibility(OutPort *start, const std::list& pointsOfViewStart, - InPort *end, const std::list& pointsOfViewEnd) throw(Exception); + InPort *end, const std::list& pointsOfViewEnd) ; protected: void prepareInputsFromOutOfScope(int branchNb); void putValueOnBranch(Any *val, unsigned branchId, bool first); diff --git a/src/engine/ElementaryNode.cxx b/src/engine/ElementaryNode.cxx index d227016b9..25d984d13 100644 --- a/src/engine/ElementaryNode.cxx +++ b/src/engine/ElementaryNode.cxx @@ -165,7 +165,7 @@ int ElementaryNode::getNumberOfOutputPorts() const return _setOfOutputPort.size(); } -InputPort *ElementaryNode::getInputPort(const std::string& name) const throw(YACS::Exception) +InputPort *ElementaryNode::getInputPort(const std::string& name) const { try { return Node::getInputPort(name); @@ -174,7 +174,7 @@ InputPort *ElementaryNode::getInputPort(const std::string& name) const throw(YAC return getPort(name,_setOfInputPort); } -OutputPort *ElementaryNode::getOutputPort(const std::string& name) const throw(YACS::Exception) +OutputPort *ElementaryNode::getOutputPort(const std::string& name) const { return getPort(name,_setOfOutputPort); } @@ -236,12 +236,12 @@ std::vector< std::pair > ElementaryNode::getSetOfLinksComin return ret; } -InputDataStreamPort *ElementaryNode::getInputDataStreamPort(const std::string& name) const throw(YACS::Exception) +InputDataStreamPort *ElementaryNode::getInputDataStreamPort(const std::string& name) const { return getPort(name,_setOfInputDataStreamPort); } -OutputDataStreamPort *ElementaryNode::getOutputDataStreamPort(const std::string& name) const throw(YACS::Exception) +OutputDataStreamPort *ElementaryNode::getOutputDataStreamPort(const std::string& name) const { return getPort(name,_setOfOutputDataStreamPort); } @@ -520,7 +520,7 @@ void ElementaryNode::getReadyTasks(std::vector& tasks) * remove port from node at edition. Ports are typed. */ -void ElementaryNode::edRemovePort(Port *port) throw(YACS::Exception) +void ElementaryNode::edRemovePort(Port *port) { DEBTRACE("ElementaryNode::edRemovePort "); if(port->getNode()!=this) @@ -568,13 +568,13 @@ list ElementaryNode::getProgressWeight() const return ret; } -Node *ElementaryNode::getChildByName(const std::string& name) const throw(YACS::Exception) +Node *ElementaryNode::getChildByName(const std::string& name) const { string what("ElementaryNode does not agregate any nodes particullary node with name "); what+=name; throw Exception(what); } -void ElementaryNode::checkBasicConsistency() const throw(YACS::Exception) +void ElementaryNode::checkBasicConsistency() const { DEBTRACE("ElementaryNode::checkBasicConsistency"); list::const_iterator iter; @@ -600,7 +600,7 @@ InputPort *ElementaryNode::createInputPort(const std::string& inputPortName, Typ * WARNING: CHECK CASE OF BLOC: ONLY INPUT PORTS NOT INTERNALLY CONNECTED MUST BE VISIBLE. */ -InputPort *ElementaryNode::edAddInputPort(const std::string& inputPortName, TypeCode* type) throw(YACS::Exception) +InputPort *ElementaryNode::edAddInputPort(const std::string& inputPortName, TypeCode* type) { // Cannot create an InputPort defined with InPropertyPort name. @@ -669,7 +669,7 @@ OutputPort *ElementaryNode::createOutputPort(const std::string& outputPortName, * for now, publication is done the same way as input ports */ -OutputPort *ElementaryNode::edAddOutputPort(const std::string& outputPortName, TypeCode* type) throw(YACS::Exception) +OutputPort *ElementaryNode::edAddOutputPort(const std::string& outputPortName, TypeCode* type) { OutputPort *ret =0; if (edCheckAddPort(outputPortName,_setOfOutputPort,type)) @@ -691,7 +691,7 @@ InputDataStreamPort *ElementaryNode::createInputDataStreamPort(const std::string return getRuntime()->createInputDataStreamPort(inputPortDSName, this, type); } -InputDataStreamPort *ElementaryNode::edAddInputDataStreamPort(const std::string& inputPortDSName, TypeCode* type) throw(YACS::Exception) +InputDataStreamPort *ElementaryNode::edAddInputDataStreamPort(const std::string& inputPortDSName, TypeCode* type) { InputDataStreamPort *ret = 0; if (edCheckAddPort(inputPortDSName,_setOfInputDataStreamPort,type)) @@ -708,7 +708,7 @@ OutputDataStreamPort *ElementaryNode::createOutputDataStreamPort(const std::stri return getRuntime()->createOutputDataStreamPort(outputPortDSName, this, type); } -OutputDataStreamPort *ElementaryNode::edAddOutputDataStreamPort(const std::string& outputPortDSName, TypeCode* type) throw(YACS::Exception) +OutputDataStreamPort *ElementaryNode::edAddOutputDataStreamPort(const std::string& outputPortDSName, TypeCode* type) { OutputDataStreamPort *ret = 0; if (edCheckAddPort(outputPortDSName,_setOfOutputDataStreamPort,type)) @@ -724,7 +724,7 @@ OutputDataStreamPort *ElementaryNode::edAddOutputDataStreamPort(const std::strin * get the input port name used by the current node (see composed nodes) */ -string ElementaryNode::getInPortName(const InPort * inPort) const throw(YACS::Exception) +string ElementaryNode::getInPortName(const InPort * inPort) const { Node *node = inPort->getNode(); if ( node != this ) @@ -735,7 +735,7 @@ string ElementaryNode::getInPortName(const InPort * inPort) const throw(YACS::Ex return inPort->getName(); } -string ElementaryNode::getOutPortName(const OutPort *outPort) const throw(YACS::Exception) +string ElementaryNode::getOutPortName(const OutPort *outPort) const { Node *node = outPort->getNode(); if ( node != this ) diff --git a/src/engine/ElementaryNode.hxx b/src/engine/ElementaryNode.hxx index 1af8201e4..d8d87402d 100644 --- a/src/engine/ElementaryNode.hxx +++ b/src/engine/ElementaryNode.hxx @@ -68,18 +68,18 @@ namespace YACS Container *getContainer(); YACS::StatesForNode getState() const; void getReadyTasks(std::vector& tasks); - void edRemovePort(Port *port) throw(Exception); + void edRemovePort(Port *port) ; std::list getRecursiveConstituents() const; std::list getProgressWeight() const; - Node *getChildByName(const std::string& name) const throw(Exception); - virtual void checkBasicConsistency() const throw(Exception); + Node *getChildByName(const std::string& name) const ; + virtual void checkBasicConsistency() const ; ComposedNode *getDynClonerIfExists(const ComposedNode *levelToStop) const; int getNumberOfInputPorts() const; int getNumberOfOutputPorts() const; - std::string getInPortName(const InPort *) const throw (Exception); - std::string getOutPortName(const OutPort *) const throw (Exception); - InputPort *getInputPort(const std::string& name) const throw(Exception); - OutputPort *getOutputPort(const std::string& name) const throw(Exception); + std::string getInPortName(const InPort *) const ; + std::string getOutPortName(const OutPort *) const ; + InputPort *getInputPort(const std::string& name) const ; + OutputPort *getOutputPort(const std::string& name) const ; std::list getSetOfInputPort() const { return _setOfInputPort; } std::list getSetOfOutputPort() const { return _setOfOutputPort; } std::list getLocalInputPorts() const { return _setOfInputPort; } @@ -90,16 +90,16 @@ namespace YACS virtual std::vector< std::pair > getSetOfLinksComingInCurrentScope() const; std::list getSetOfInputDataStreamPort() const { return _setOfInputDataStreamPort; } std::list getSetOfOutputDataStreamPort() const { return _setOfOutputDataStreamPort; } - InputDataStreamPort *getInputDataStreamPort(const std::string& name) const throw(Exception); - OutputDataStreamPort *getOutputDataStreamPort(const std::string& name) const throw(Exception); + InputDataStreamPort *getInputDataStreamPort(const std::string& name) const ; + OutputDataStreamPort *getOutputDataStreamPort(const std::string& name) const ; virtual InputPort *createInputPort(const std::string& inputPortName, TypeCode* type); virtual OutputPort *createOutputPort(const std::string& outputPortName, TypeCode* type); virtual InputDataStreamPort *createInputDataStreamPort(const std::string& inputPortDSName, TypeCode* type); virtual OutputDataStreamPort *createOutputDataStreamPort(const std::string& outputPortDSName, TypeCode* type); - virtual InputPort *edAddInputPort(const std::string& inputPortName, TypeCode* type) throw(Exception); - virtual OutputPort *edAddOutputPort(const std::string& outputPortName, TypeCode* type) throw(Exception); - virtual InputDataStreamPort *edAddInputDataStreamPort(const std::string& inputPortDSName, TypeCode* type) throw(Exception); - virtual OutputDataStreamPort *edAddOutputDataStreamPort(const std::string& outputPortDSName, TypeCode* type) throw(Exception); + virtual InputPort *edAddInputPort(const std::string& inputPortName, TypeCode* type) ; + virtual OutputPort *edAddOutputPort(const std::string& outputPortName, TypeCode* type) ; + virtual InputDataStreamPort *edAddInputDataStreamPort(const std::string& inputPortDSName, TypeCode* type) ; + virtual OutputDataStreamPort *edAddOutputDataStreamPort(const std::string& outputPortDSName, TypeCode* type) ; virtual void edOrderInputPorts(const std::list& ports); virtual void edOrderOutputPorts(const std::list& ports); @@ -141,13 +141,13 @@ namespace YACS void edDisconnectAllLinksWithMe(); bool areAllInputPortsValid() const; template - PORT *getPort(const std::string& name, const std::list& setOfPorts) const throw(Exception); + PORT *getPort(const std::string& name, const std::list& setOfPorts) const ; template - PORT *edAddPort(const std::string& portName, std::list& setOfPorts, ENUMTYPE type) throw(Exception); + PORT *edAddPort(const std::string& portName, std::list& setOfPorts, ENUMTYPE type) ; template - bool edCheckAddPort(const std::string& portName, std::list& setOfPorts, ENUMTYPE type) throw(Exception); + bool edCheckAddPort(const std::string& portName, std::list& setOfPorts, ENUMTYPE type) ; template - static void edRemovePortTypedFromSet(PORT *port, std::list& setOfPorts) throw(Exception); + static void edRemovePortTypedFromSet(PORT *port, std::list& setOfPorts) ; template static bool isPortNameAlreadyExist(const std::string& portName, const std::list& setOfPorts); }; @@ -157,7 +157,7 @@ namespace YACS */ template - PORT *ElementaryNode::getPort(const std::string& name, const std::list& setOfPorts) const throw(Exception) + PORT *ElementaryNode::getPort(const std::string& name, const std::list& setOfPorts) const { for(typename std::list::const_iterator iter=setOfPorts.begin();iter!=setOfPorts.end();iter++) { @@ -176,7 +176,7 @@ namespace YACS */ template - PORT *ElementaryNode::edAddPort(const std::string& portName, std::list& setOfPorts, ENUMTYPE type) throw(Exception) + PORT *ElementaryNode::edAddPort(const std::string& portName, std::list& setOfPorts, ENUMTYPE type) { checkValidityOfPortName(portName); if(isPortNameAlreadyExist(portName, setOfPorts)) @@ -190,7 +190,7 @@ namespace YACS } template - bool ElementaryNode::edCheckAddPort(const std::string& portName, std::list& setOfPorts, ENUMTYPE type) throw(Exception) + bool ElementaryNode::edCheckAddPort(const std::string& portName, std::list& setOfPorts, ENUMTYPE type) { checkValidityOfPortName(portName); if(isPortNameAlreadyExist(portName, setOfPorts)) @@ -206,7 +206,7 @@ namespace YACS */ template - void ElementaryNode::edRemovePortTypedFromSet(PORT *port, std::list& setOfPorts) throw(Exception) + void ElementaryNode::edRemovePortTypedFromSet(PORT *port, std::list& setOfPorts) { if(!isPortNameAlreadyExist(port->getName(), setOfPorts)) throw Exception("Port is not part of the list : unable to remove it"); diff --git a/src/engine/ForEachLoop.cxx b/src/engine/ForEachLoop.cxx index f1e0eb28a..b35870e97 100644 --- a/src/engine/ForEachLoop.cxx +++ b/src/engine/ForEachLoop.cxx @@ -107,7 +107,7 @@ AnySplitOutputPort::AnySplitOutputPort(const AnySplitOutputPort& other, Node *ne { } -bool AnySplitOutputPort::addInPort(InPort *inPort) throw(YACS::Exception) +bool AnySplitOutputPort::addInPort(InPort *inPort) { bool ret=OutputPort::addInPort(inPort); if(_repr) @@ -123,7 +123,7 @@ void AnySplitOutputPort::getAllRepresented(std::set& represented) con _repr->getAllRepresented(represented); } -int AnySplitOutputPort::removeInPort(InPort *inPort, bool forward) throw(YACS::Exception) +int AnySplitOutputPort::removeInPort(InPort *inPort, bool forward) { bool ret=OutputPort::removeInPort(inPort,forward); if(_repr) @@ -219,7 +219,7 @@ SplitterNode::SplitterNode(const SplitterNode& other, ForEachLoopGen *father):El { } -InputPort *SplitterNode::getInputPort(const std::string& name) const throw(YACS::Exception) +InputPort *SplitterNode::getInputPort(const std::string& name) const { if(name==NAME_OF_SEQUENCE_INPUT) return (InputPort *)&_dataPortToDispatch; @@ -672,7 +672,7 @@ int ForEachLoopGen::getNumberOfInputPorts() const return DynParaLoop::getNumberOfInputPorts()+1; } -void ForEachLoopGen::checkNoCyclePassingThrough(Node *node) throw(YACS::Exception) +void ForEachLoopGen::checkNoCyclePassingThrough(Node *node) { //TO DO } @@ -695,7 +695,7 @@ std::list ForEachLoopGen::getLocalInputPorts() const return ret; } -InputPort *ForEachLoopGen::getInputPort(const std::string& name) const throw(YACS::Exception) +InputPort *ForEachLoopGen::getInputPort(const std::string& name) const { if(name==SplitterNode::NAME_OF_SEQUENCE_INPUT) return (InputPort *)&_splitterNode._dataPortToDispatch; @@ -703,7 +703,7 @@ InputPort *ForEachLoopGen::getInputPort(const std::string& name) const throw(YAC return DynParaLoop::getInputPort(name); } -OutputPort *ForEachLoopGen::getOutputPort(const std::string& name) const throw(YACS::Exception) +OutputPort *ForEachLoopGen::getOutputPort(const std::string& name) const { for(vector::const_iterator iter=_outGoingPorts.begin();iter!=_outGoingPorts.end();iter++) { @@ -713,7 +713,7 @@ OutputPort *ForEachLoopGen::getOutputPort(const std::string& name) const throw(Y return DynParaLoop::getOutputPort(name); } -OutPort *ForEachLoopGen::getOutPort(const std::string& name) const throw(YACS::Exception) +OutPort *ForEachLoopGen::getOutPort(const std::string& name) const { for(vector::const_iterator iter=_outGoingPorts.begin();iter!=_outGoingPorts.end();iter++) { @@ -723,7 +723,7 @@ OutPort *ForEachLoopGen::getOutPort(const std::string& name) const throw(YACS::E return DynParaLoop::getOutPort(name); } -Node *ForEachLoopGen::getChildByShortName(const std::string& name) const throw(YACS::Exception) +Node *ForEachLoopGen::getChildByShortName(const std::string& name) const { if(name==NAME_OF_SPLITTERNODE) return (Node *)&_splitterNode; @@ -957,7 +957,7 @@ void ForEachLoopGen::buildDelegateOf(std::pair& port, InPo throw Exception("ForEachLoopGen::buildDelegateOf : not implemented for DS because not specified"); } -void ForEachLoopGen::getDelegateOf(std::pair& port, InPort *finalTarget, const std::list& pointsOfView) throw(YACS::Exception) +void ForEachLoopGen::getDelegateOf(std::pair& port, InPort *finalTarget, const std::list& pointsOfView) { string typeOfPortInstance=(port.first)->getNameOfTypeOfCurrentInstance(); if(typeOfPortInstance==OutputPort::NAME) @@ -978,7 +978,7 @@ void ForEachLoopGen::getDelegateOf(std::pair& port, InPort throw Exception("ForEachLoopGen::getDelegateOf : not implemented because not specified"); } -void ForEachLoopGen::releaseDelegateOf(OutPort *portDwn, OutPort *portUp, InPort *finalTarget, const std::list& pointsOfView) throw(YACS::Exception) +void ForEachLoopGen::releaseDelegateOf(OutPort *portDwn, OutPort *portUp, InPort *finalTarget, const std::list& pointsOfView) { string typeOfPortInstance=portDwn->getNameOfTypeOfCurrentInstance(); if(typeOfPortInstance==OutputPort::NAME) @@ -1075,7 +1075,7 @@ void ForEachLoopGen::createOutputOutOfScopeInterceptors(int branchNb) } void ForEachLoopGen::checkLinkPossibility(OutPort *start, const std::list& pointsOfViewStart, - InPort *end, const std::list& pointsOfViewEnd) throw(YACS::Exception) + InPort *end, const std::list& pointsOfViewEnd) { DynParaLoop::checkLinkPossibility(start, pointsOfViewStart, end, pointsOfViewEnd); if(end->getNode() == &_splitterNode) diff --git a/src/engine/ForEachLoop.hxx b/src/engine/ForEachLoop.hxx index 056f73aca..ab1580420 100644 --- a/src/engine/ForEachLoop.hxx +++ b/src/engine/ForEachLoop.hxx @@ -64,9 +64,9 @@ namespace YACS void incrRef() const; AnySplitOutputPort(const std::string& name, Node *node, TypeCode *type); AnySplitOutputPort(const AnySplitOutputPort& other, Node *newHelder); - bool addInPort(InPort *inPort) throw(Exception); + bool addInPort(InPort *inPort) ; void getAllRepresented(std::set& represented) const; - int removeInPort(InPort *inPort, bool forward) throw(Exception); + int removeInPort(InPort *inPort, bool forward) ; void addRepr(OutPort *repr, InterceptorInputPort *intercptr); OutPort *getRepr() const { return _repr; } OutputPort *clone(Node *newHelder) const; @@ -94,7 +94,7 @@ namespace YACS private: SplitterNode(const std::string& name, TypeCode *typeOfData, ForEachLoopGen *father); SplitterNode(const SplitterNode& other, ForEachLoopGen *father); - InputPort *getInputPort(const std::string& name) const throw(Exception); + InputPort *getInputPort(const std::string& name) const ; Node *simpleClone(ComposedNode *father, bool editionOnly) const; unsigned getNumberOfElements() const; void execute(); @@ -180,17 +180,17 @@ namespace YACS void getReadyTasks(std::vector& tasks); int getNumberOfInputPorts() const; // - void checkNoCyclePassingThrough(Node *node) throw(Exception); + void checkNoCyclePassingThrough(Node *node) ; void selectRunnableTasks(std::vector& tasks); // unsigned getExecCurrentId() const { return _execCurrentId; } // for update progress bar on GUI part std::list getSetOfInputPort() const; std::list getLocalInputPorts() const; InputPort *edGetSeqOfSamplesPort() { return &_splitterNode._dataPortToDispatch; } - InputPort *getInputPort(const std::string& name) const throw(Exception); - OutPort *getOutPort(const std::string& name) const throw(Exception); - OutputPort *getOutputPort(const std::string& name) const throw(Exception); - Node *getChildByShortName(const std::string& name) const throw(Exception); + InputPort *getInputPort(const std::string& name) const ; + OutPort *getOutPort(const std::string& name) const ; + OutputPort *getOutputPort(const std::string& name) const ; + Node *getChildByShortName(const std::string& name) const ; std::list getLocalOutputPorts() const; void writeDot(std::ostream &os) const; virtual std::string typeName() {return "YACS__ENGINE__ForEachLoop";} @@ -210,15 +210,15 @@ namespace YACS void cleanDynGraph() override; protected: void checkLinkPossibility(OutPort *start, const std::list& pointsOfViewStart, - InPort *end, const std::list& pointsOfViewEnd) throw(Exception); + InPort *end, const std::list& pointsOfViewEnd) ; YACS::Event updateStateOnFinishedEventFrom(Node *node); YACS::Event updateStateForInitNodeOnFinishedEventFrom(Node *node, unsigned int id); YACS::Event updateStateForWorkNodeOnFinishedEventFrom(Node *node, unsigned int id, bool isNormalFinish); YACS::Event updateStateForFinalizeNodeOnFinishedEventFrom(Node *node, unsigned int id); YACS::Event updateStateOnFailedEventFrom(Node *node, const Executor *execInst); void buildDelegateOf(std::pair& port, InPort *finalTarget, const std::list& pointsOfView); - void getDelegateOf(std::pair& port, InPort *finalTarget, const std::list& pointsOfView) throw(Exception); - void releaseDelegateOf(OutPort *portDwn, OutPort *portUp, InPort *finalTarget, const std::list& pointsOfView) throw(Exception); + void getDelegateOf(std::pair& port, InPort *finalTarget, const std::list& pointsOfView) ; + void releaseDelegateOf(OutPort *portDwn, OutPort *portUp, InPort *finalTarget, const std::list& pointsOfView) ; protected: void pushAllSequenceValues(); void createOutputOutOfScopeInterceptors(int branchNb); diff --git a/src/engine/ForLoop.cxx b/src/engine/ForLoop.cxx index be7cae371..519045134 100644 --- a/src/engine/ForLoop.cxx +++ b/src/engine/ForLoop.cxx @@ -67,7 +67,7 @@ Node *ForLoop::simpleClone(ComposedNode *father, bool editionOnly) const return new ForLoop(*this,father,editionOnly); } -InputPort* ForLoop::getInputPort(const std::string& name) const throw(YACS::Exception) +InputPort* ForLoop::getInputPort(const std::string& name) const { if(name == NAME_OF_NSTEPS_NUMBER)return (InputPort*)&_nbOfTimesPort; return Loop::getInputPort(name); @@ -182,14 +182,14 @@ std::list ForLoop::getLocalInputPorts() const return ret; } -OutPort *ForLoop::getOutPort(const std::string& name) const throw(YACS::Exception) +OutPort *ForLoop::getOutPort(const std::string& name) const { if(name==NAME_OF_INDEX) return (OutPort *)&_indexPort; return Loop::getOutPort(name); } -OutputPort *ForLoop::getOutputPort(const std::string& name) const throw(YACS::Exception) +OutputPort *ForLoop::getOutputPort(const std::string& name) const { if(name==NAME_OF_INDEX) return (OutputPort *)&_indexPort; diff --git a/src/engine/ForLoop.hxx b/src/engine/ForLoop.hxx index 47b760e94..2ecbc79b4 100644 --- a/src/engine/ForLoop.hxx +++ b/src/engine/ForLoop.hxx @@ -44,9 +44,9 @@ namespace YACS void init(bool start=true); InputPort *edGetNbOfTimesInputPort() { return &_nbOfTimesPort; } Node *simpleClone(ComposedNode *father, bool editionOnly=true) const; - InputPort* getInputPort(const std::string& name) const throw(Exception); - OutPort *getOutPort(const std::string& name) const throw(Exception); - OutputPort *getOutputPort(const std::string& name) const throw(Exception); + InputPort* getInputPort(const std::string& name) const ; + OutPort *getOutPort(const std::string& name) const ; + OutputPort *getOutputPort(const std::string& name) const ; std::list getLocalInputPorts() const; std::list getLocalOutputPorts() const; std::list getSetOfOutputPort() const; diff --git a/src/engine/InPort.cxx b/src/engine/InPort.cxx index fd39c76d8..82d727063 100644 --- a/src/engine/InPort.cxx +++ b/src/engine/InPort.cxx @@ -47,7 +47,7 @@ int InPort::edGetNumberOfLinks() const return _backLinks.size(); } -void InPort::edRemoveAllLinksLinkedWithMe() throw(YACS::Exception) +void InPort::edRemoveAllLinksLinkedWithMe() { set< std::pair > temp(_backLinks);//edRemoveLink called after causes invalidation of set iterator. for(auto iter : temp) diff --git a/src/engine/InPort.hxx b/src/engine/InPort.hxx index 9f393d5bc..f0879ecf9 100644 --- a/src/engine/InPort.hxx +++ b/src/engine/InPort.hxx @@ -70,7 +70,7 @@ namespace YACS protected: InPort(const InPort& other, Node *newHelder); InPort(const std::string& name, Node *node, TypeCode* type); - void edRemoveAllLinksLinkedWithMe() throw(Exception); + void edRemoveAllLinksLinkedWithMe() ; virtual void edNotifyReferencedBy(OutPort *fromPort, bool isLoopProof = true); virtual void edNotifyDereferencedBy(OutPort *fromPort); virtual void getAllRepresentants(std::set& repr) const; diff --git a/src/engine/InPropertyPort.cxx b/src/engine/InPropertyPort.cxx index 3d4005471..d66280804 100644 --- a/src/engine/InPropertyPort.cxx +++ b/src/engine/InPropertyPort.cxx @@ -84,7 +84,7 @@ InPropertyPort::get() const } void -InPropertyPort::put(const void *data) throw(ConversionException) +InPropertyPort::put(const void *data) { put((YACS::ENGINE::Any *)data); } diff --git a/src/engine/InPropertyPort.hxx b/src/engine/InPropertyPort.hxx index c9cff5b45..fa20b9e9b 100644 --- a/src/engine/InPropertyPort.hxx +++ b/src/engine/InPropertyPort.hxx @@ -59,7 +59,7 @@ namespace YACS virtual void exRestoreInit(); virtual InPropertyPort *clone(Node *newHelder) const; virtual void *get() const; - virtual void put(const void *data) throw(ConversionException); + virtual void put(const void *data); virtual void put(YACS::ENGINE::Any *data); void releaseData() override; protected: diff --git a/src/engine/InlineNode.cxx b/src/engine/InlineNode.cxx index fd687044d..a025829de 100644 --- a/src/engine/InlineNode.cxx +++ b/src/engine/InlineNode.cxx @@ -72,7 +72,7 @@ void InlineFuncNode::setFname(const std::string& fname) modified(); } -void InlineFuncNode::checkBasicConsistency() const throw(YACS::Exception) +void InlineFuncNode::checkBasicConsistency() const { InlineNode::checkBasicConsistency(); if(_fname.empty() ) diff --git a/src/engine/InlineNode.hxx b/src/engine/InlineNode.hxx index 67d917722..c03b3ccb4 100644 --- a/src/engine/InlineNode.hxx +++ b/src/engine/InlineNode.hxx @@ -102,7 +102,7 @@ namespace YACS void accept(Visitor *visitor); virtual ~InlineFuncNode(); virtual std::string typeName() { return "YACS__ENGINE__InlineFuncNode"; } - virtual void checkBasicConsistency() const throw(Exception); + virtual void checkBasicConsistency() const ; protected: std::string _fname; }; diff --git a/src/engine/InputPort.cxx b/src/engine/InputPort.cxx index a0b141397..3bd4c06df 100644 --- a/src/engine/InputPort.cxx +++ b/src/engine/InputPort.cxx @@ -145,7 +145,7 @@ void InputPort::edRemoveManInit() } //! Check basically that this port has one chance to be specified on time. It's a necessary condition \b not \b sufficient at all. -void InputPort::checkBasicConsistency() const throw(YACS::Exception) +void InputPort::checkBasicConsistency() const { if(!_canBeNull && !edIsManuallyInitialized() && _backLinks.size()==0 ) { @@ -192,7 +192,7 @@ ProxyPort::~ProxyPort() */ } -void ProxyPort::edRemoveAllLinksLinkedWithMe() throw(YACS::Exception) +void ProxyPort::edRemoveAllLinksLinkedWithMe() { _port->edRemoveAllLinksLinkedWithMe(); } @@ -255,7 +255,7 @@ void ProxyPort::releaseData() _port->releaseData(); } -void ProxyPort::put(const void *data) throw(ConversionException) +void ProxyPort::put(const void *data) { _port->put(data); } diff --git a/src/engine/InputPort.hxx b/src/engine/InputPort.hxx index 91b368fe5..86cbbfc37 100644 --- a/src/engine/InputPort.hxx +++ b/src/engine/InputPort.hxx @@ -66,7 +66,7 @@ namespace YACS void edInit(Any *value); void edInit(const std::string& impl,const void* value); virtual void edRemoveManInit(); - virtual void checkBasicConsistency() const throw(Exception); + virtual void checkBasicConsistency() const ; virtual void exInit(bool start); virtual void exSaveInit() = 0; virtual void exRestoreInit() = 0; @@ -75,7 +75,7 @@ namespace YACS virtual void *get() const = 0; virtual void releaseData() = 0; - virtual void put(const void *data) throw(ConversionException) = 0; + virtual void put(const void *data) = 0; virtual std::string dump(); virtual std::string getHumanRepr(); virtual void setStringRef(std::string strRef); @@ -102,7 +102,7 @@ namespace YACS ProxyPort(InputPort* p); ~ProxyPort(); - void edRemoveAllLinksLinkedWithMe() throw(Exception); + void edRemoveAllLinksLinkedWithMe() ; InputPort *clone(Node *newHelder) const; void edNotifyReferencedBy(OutPort *fromPort, bool isLoopProof = true) override; void edNotifyDereferencedBy(OutPort *fromPort); @@ -113,7 +113,7 @@ namespace YACS InputPort *getPublicRepresentant(); #endif void *get() const; - virtual void put(const void *data) throw(ConversionException) ; + virtual void put(const void *data) ; void releaseData() override; int edGetNumberOfLinks() const; bool isIntermediate() const { return true; } diff --git a/src/engine/LinkInfo.cxx b/src/engine/LinkInfo.cxx index ca16eef1d..ac5d92254 100644 --- a/src/engine/LinkInfo.cxx +++ b/src/engine/LinkInfo.cxx @@ -50,7 +50,7 @@ void LinkInfo::startCollapseTransac() _level++; } -void LinkInfo::endCollapseTransac() throw(YACS::Exception) +void LinkInfo::endCollapseTransac() { if(--_level==0) { @@ -83,7 +83,7 @@ void LinkInfo::pushWarnLink(OutPort *semStart, InPort *end, WarnReason reason) _collapse[reason].back().push_back(pair(semStart,end)); } -void LinkInfo::pushErrLink(OutPort *semStart, InPort *end, ErrReason reason) throw(YACS::Exception) +void LinkInfo::pushErrLink(OutPort *semStart, InPort *end, ErrReason reason) { if(reason==E_NEVER_SET_INPUTPORT) _unsetInPort.push_back(end); @@ -96,7 +96,7 @@ void LinkInfo::pushErrLink(OutPort *semStart, InPort *end, ErrReason reason) thr throw Exception(getErrRepr()); } -void LinkInfo::pushErrSwitch(CollectorSwOutPort *collector) throw(YACS::Exception) +void LinkInfo::pushErrSwitch(CollectorSwOutPort *collector) { _errorsOnSwitchCases.push_back(collector); if(_level==0) @@ -109,7 +109,7 @@ void LinkInfo::pushUselessCFLink(Node *start, Node *end) _uselessLinks.insert(pair(start,end)); } -void LinkInfo::takeDecision() const throw(YACS::Exception) +void LinkInfo::takeDecision() const { if(!_errors.empty()) throw Exception(getErrRepr()); diff --git a/src/engine/LinkInfo.hxx b/src/engine/LinkInfo.hxx index 26f66ca17..abd39cc55 100644 --- a/src/engine/LinkInfo.hxx +++ b/src/engine/LinkInfo.hxx @@ -96,14 +96,14 @@ namespace YACS LinkInfo(unsigned char level); void clearAll(); void startCollapseTransac(); - void endCollapseTransac() throw(Exception); + void endCollapseTransac(); void setPointOfView(ComposedNode *pov); void pushInfoLink(OutPort *semStart, InPort *end, InfoReason reason); void pushWarnLink(OutPort *semStart, InPort *end, WarnReason reason); - void pushErrLink(OutPort *semStart, InPort *end, ErrReason reason) throw(Exception); - void pushErrSwitch(CollectorSwOutPort *collector) throw(Exception); + void pushErrLink(OutPort *semStart, InPort *end, ErrReason reason); + void pushErrSwitch(CollectorSwOutPort *collector); void pushUselessCFLink(Node *start, Node *end); - void takeDecision() const throw(Exception); + void takeDecision() const; //Typically methods for high level use. std::string getGlobalRepr() const; std::string getInfoRepr() const; diff --git a/src/engine/Loop.cxx b/src/engine/Loop.cxx index 7f0a29097..ec28f3c6e 100644 --- a/src/engine/Loop.cxx +++ b/src/engine/Loop.cxx @@ -47,7 +47,7 @@ void InputPort4DF2DS::getAllRepresentants(std::set& repr) const repr.insert(s.begin(),s.end()); } -void *InputPort4DF2DS::get() const throw(YACS::Exception) +void *InputPort4DF2DS::get() const { if(!_data) { @@ -75,7 +75,7 @@ void InputPort4DF2DS::exSaveInit() _initValue->incrRef(); } -void InputPort4DF2DS::put(const void *data) throw(ConversionException) +void InputPort4DF2DS::put(const void *data) { put((Any *)data); } @@ -122,7 +122,7 @@ void DFToDSForLoop::getReadyTasks(std::vector& tasks) { } -InputPort *DFToDSForLoop::getInputPort(const std::string& name) const throw(YACS::Exception) +InputPort *DFToDSForLoop::getInputPort(const std::string& name) const { try { return Node::getInputPort(name); @@ -133,7 +133,7 @@ InputPort *DFToDSForLoop::getInputPort(const std::string& name) const throw(YACS return (*it); } -OutputDataStreamPort *DFToDSForLoop::getOutputDataStreamPort(const std::string& name) const throw(YACS::Exception) +OutputDataStreamPort *DFToDSForLoop::getOutputDataStreamPort(const std::string& name) const { list::const_iterator it =_setOfOutputDataStreamPort.begin(); return (*it); @@ -167,7 +167,7 @@ void OutputPort4DS2DF::getAllRepresented(std::set& represented) const (*iter)->getAllRepresented(represented); } -void OutputPort4DS2DF::put(const void *data) throw(ConversionException) +void OutputPort4DS2DF::put(const void *data) { put((Any *)data); OutputPort::put(data); @@ -227,13 +227,13 @@ void DSToDFForLoop::getReadyTasks(std::vector& tasks) { } -OutputPort *DSToDFForLoop::getOutputPort(const std::string& name) const throw(YACS::Exception) +OutputPort *DSToDFForLoop::getOutputPort(const std::string& name) const { list::const_iterator it = _setOfOutputPort.begin(); return (*it); } -InputDataStreamPort *DSToDFForLoop::getInputDataStreamPort(const std::string& name) const throw(YACS::Exception) +InputDataStreamPort *DSToDFForLoop::getInputDataStreamPort(const std::string& name) const { list::const_iterator it = _setOfInputDataStreamPort.begin(); return (*it); @@ -350,7 +350,7 @@ Node *Loop::edSetNode(Node *node) return ret; } -bool Loop::edAddChild(Node *node) throw(YACS::Exception) +bool Loop::edAddChild(Node *node) { return edSetNode(node); } @@ -390,7 +390,7 @@ void Loop::getReadyTasks(std::vector& tasks) } } -void Loop::edRemoveChild(Node *node) throw(YACS::Exception) +void Loop::edRemoveChild(Node *node) { StaticDefinedComposedNode::edRemoveChild(node); if(_node==node) @@ -437,7 +437,7 @@ void Loop::partitionRegardingDPL(const PartDefinition *pd, std::mappartitionRegardingDPL(pd,zeMap); } -Node *Loop::getChildByShortName(const std::string& name) const throw(YACS::Exception) +Node *Loop::getChildByShortName(const std::string& name) const { if (_node) if(name==_node->getName()) @@ -446,12 +446,12 @@ Node *Loop::getChildByShortName(const std::string& name) const throw(YACS::Excep throw Exception(what); } -TypeCode* Loop::MappingDF2DS(TypeCode* type) throw(YACS::Exception) +TypeCode* Loop::MappingDF2DS(TypeCode* type) { return type; } -TypeCode* Loop::MappingDS2DF(TypeCode* type) throw(YACS::Exception) +TypeCode* Loop::MappingDS2DF(TypeCode* type) { return type; } @@ -513,7 +513,7 @@ void Loop::buildDelegateOf(std::pair& port, InPort *finalT port.first=(*iter)->getOutputDataStreamPort(""); } -void Loop::getDelegateOf(InPort * & port, OutPort *initialStart, const std::list& pointsOfView) throw(YACS::Exception) +void Loop::getDelegateOf(InPort * & port, OutPort *initialStart, const std::list& pointsOfView) { string typeOfPortInstance=port->getNameOfTypeOfCurrentInstance(); if(typeOfPortInstance!=InputPort::NAME || @@ -536,7 +536,7 @@ void Loop::getDelegateOf(InPort * & port, OutPort *initialStart, const std::list } void Loop::getDelegateOf(std::pair& port, InPort *finalTarget, - const std::list& pointsOfView) throw(YACS::Exception) + const std::list& pointsOfView) { string typeOfPortInstance=(port.first)->getNameOfTypeOfCurrentInstance(); if(typeOfPortInstance!=OutputPort::NAME || @@ -558,7 +558,7 @@ void Loop::getDelegateOf(std::pair& port, InPort *finalTar port.first=(*iter)->getOutputDataStreamPort(""); } -void Loop::releaseDelegateOf(InPort * & port, OutPort *initialStart, const std::list& pointsOfView) throw(YACS::Exception) +void Loop::releaseDelegateOf(InPort * & port, OutPort *initialStart, const std::list& pointsOfView) { string typeOfPortInstance=port->getNameOfTypeOfCurrentInstance(); if(typeOfPortInstance!=InputPort::NAME || @@ -588,7 +588,7 @@ void Loop::releaseDelegateOf(InPort * & port, OutPort *initialStart, const std:: } } -void Loop::releaseDelegateOf(OutPort *portDwn, OutPort *portUp, InPort *finalTarget, const std::list& pointsOfView) throw(YACS::Exception) +void Loop::releaseDelegateOf(OutPort *portDwn, OutPort *portUp, InPort *finalTarget, const std::list& pointsOfView) { if(portDwn==portUp) return ; @@ -604,7 +604,7 @@ void Loop::releaseDelegateOf(OutPort *portDwn, OutPort *portUp, InPort *finalTar } } -void Loop::checkNoCyclePassingThrough(Node *node) throw(YACS::Exception) +void Loop::checkNoCyclePassingThrough(Node *node) { //throw Exception("Loop::checkNoCyclePassingThrough : Internal error occured"); } @@ -644,7 +644,7 @@ bool Loop::isNecessaryToBuildSpecificDelegateDF2DS(const std::list& repr) const; void releaseData() override; - void put(const void *data) throw(ConversionException); + void put(const void *data); InputPort *clone(Node *newHelder) const; - void *get() const throw(Exception); + void *get() const ; void exRestoreInit(); void exSaveInit(); void put(Any *data); @@ -66,8 +66,8 @@ namespace YACS void loopHasOneMoreRef() { _nbOfTimeUsed++; } bool loopHasOneLessRef() { return --_nbOfTimeUsed==0; } void getReadyTasks(std::vector& tasks); - InputPort *getInputPort(const std::string& name) const throw(Exception); - OutputDataStreamPort *getOutputDataStreamPort(const std::string& name) const throw(Exception); + InputPort *getInputPort(const std::string& name) const ; + OutputDataStreamPort *getOutputDataStreamPort(const std::string& name) const ; Node *simpleClone(ComposedNode *father, bool editionOnly=true) const; //run part void execute(); @@ -81,7 +81,7 @@ namespace YACS public: OutputPort4DS2DF(DSToDFForLoop *node, TypeCode *type); void getAllRepresented(std::set& represented) const; - void put(const void *data) throw(ConversionException); + void put(const void *data); OutputPort *clone(Node *newHelder) const; void put(Any *data); ~OutputPort4DS2DF(); @@ -108,8 +108,8 @@ namespace YACS void loopHasOneMoreRef() { _nbOfTimeUsed++; } bool loopHasOneLessRef() { return --_nbOfTimeUsed==0; } void getReadyTasks(std::vector& tasks); - OutputPort *getOutputPort(const std::string& name) const throw(Exception); - InputDataStreamPort *getInputDataStreamPort(const std::string& name) const throw(Exception); + OutputPort *getOutputPort(const std::string& name) const ; + InputDataStreamPort *getInputDataStreamPort(const std::string& name) const ; //run part void execute(); void load(); @@ -162,14 +162,14 @@ namespace YACS int getNbOfTurns() const { return _nbOfTurns; } //Node* DISOWNnode is a SWIG notation to indicate that the ownership of the node is transfered to C++ Node *edSetNode(Node *DISOWNnode); - virtual bool edAddChild(Node *DISOWNnode) throw(Exception); + virtual bool edAddChild(Node *DISOWNnode) ; bool isLoop() const override { return true; } Node *edRemoveNode(); - virtual void checkBasicConsistency() const throw(Exception); + virtual void checkBasicConsistency() const ; //! Returns the port which value is used to take decision about the continuation of the loop. virtual InputPort *getDecisionPort() const = 0; void getReadyTasks(std::vector& tasks); - void edRemoveChild(Node *node) throw(Exception); + void edRemoveChild(Node *node) ; bool isRepeatedUnpredictablySeveralTimes() const { return true; } std::list edGetDirectDescendants() const; std::list getSetOfInputPort() const; @@ -177,21 +177,21 @@ namespace YACS int getMaxLevelOfParallelism() const; void getWeightRegardingDPL(ComplexWeight *weight); void partitionRegardingDPL(const PartDefinition *pd, std::map >& zeMap); - Node *getChildByShortName(const std::string& name) const throw(Exception); - static TypeCode* MappingDF2DS(TypeCode* type) throw(Exception); - static TypeCode* MappingDS2DF(TypeCode* type) throw(Exception); - virtual bool edAddDFLink(OutPort *start, InPort *end) throw(Exception); + Node *getChildByShortName(const std::string& name) const ; + static TypeCode* MappingDF2DS(TypeCode* type) ; + static TypeCode* MappingDS2DF(TypeCode* type) ; + virtual bool edAddDFLink(OutPort *start, InPort *end) ; void writeDot(std::ostream &os) const; virtual void accept(Visitor *visitor); virtual std::string typeName() {return "YACS__ENGINE__Loop";} protected: void buildDelegateOf(InPort * & port, OutPort *initialStart, const std::list& pointsOfView); void buildDelegateOf(std::pair& port, InPort *finalTarget, const std::list& pointsOfView); - void getDelegateOf(InPort * & port, OutPort *initialStart, const std::list& pointsOfView) throw(Exception); - void getDelegateOf(std::pair& port, InPort *finalTarget, const std::list& pointsOfView) throw(Exception); - void releaseDelegateOf(InPort * & port, OutPort *initialStart, const std::list& pointsOfView) throw(Exception); - void releaseDelegateOf(OutPort *portDwn, OutPort *portUp, InPort *finalTarget, const std::list& pointsOfView) throw(Exception); - void checkNoCyclePassingThrough(Node *node) throw(Exception); + void getDelegateOf(InPort * & port, OutPort *initialStart, const std::list& pointsOfView) ; + void getDelegateOf(std::pair& port, InPort *finalTarget, const std::list& pointsOfView) ; + void releaseDelegateOf(InPort * & port, OutPort *initialStart, const std::list& pointsOfView) ; + void releaseDelegateOf(OutPort *portDwn, OutPort *portUp, InPort *finalTarget, const std::list& pointsOfView) ; + void checkNoCyclePassingThrough(Node *node) ; void checkControlDependancy(OutPort *start, InPort *end, bool cross, std::map < ComposedNode *, std::list < OutPort * >, SortHierarc >& fw, std::vector& fwCross, diff --git a/src/engine/Node.cxx b/src/engine/Node.cxx index fb7d4e841..4ef6a69a6 100644 --- a/src/engine/Node.cxx +++ b/src/engine/Node.cxx @@ -235,7 +235,7 @@ void Node::exDisabledState() _outGate.exNotifyDisabled(); } -InPort *Node::getInPort(const std::string& name) const throw(YACS::Exception) +InPort *Node::getInPort(const std::string& name) const { InPort *ret; try @@ -250,13 +250,13 @@ InPort *Node::getInPort(const std::string& name) const throw(YACS::Exception) } InPropertyPort * -Node::getInPropertyPort() const throw(YACS::Exception) +Node::getInPropertyPort() const { return _inPropertyPort; } InputPort * -Node::getInputPort(const std::string& name) const throw(YACS::Exception) +Node::getInputPort(const std::string& name) const { if (name == "__InPropertyPort__Node__YACS_") return _inPropertyPort; @@ -271,7 +271,7 @@ Node::getInputPort(const std::string& name) const throw(YACS::Exception) * \note: Contrary to getOutputPort method, this method returns the output port at highest level, possible. * That is to say in some ComposedNode, like ForEachLoop or Switch, an outport inside 'this' is seen differently than the true outport. */ -OutPort *Node::getOutPort(const std::string& name) const throw(YACS::Exception) +OutPort *Node::getOutPort(const std::string& name) const { OutPort *ret; try @@ -427,7 +427,7 @@ DynParaLoop *Node::getClosestDPLAmongAncestors() const return NULL; } -ComposedNode *Node::getRootNode() const throw(YACS::Exception) +ComposedNode *Node::getRootNode() const { if(!_father) throw Exception("No root node"); @@ -442,7 +442,7 @@ ComposedNode *Node::getRootNode() const throw(YACS::Exception) * USAGE NOT CLEAR, not used so far, when are those characters set ? */ -void Node::checkValidityOfPortName(const std::string& name) throw(YACS::Exception) +void Node::checkValidityOfPortName(const std::string& name) { if(name.find(SEP_CHAR_IN_PORT, 0 )!=string::npos) { @@ -464,7 +464,7 @@ void Node::checkValidityOfNodeName(const std::string& name) * @note : Check that 'node1' and 'node2' have exactly the same father * @exception : If 'node1' and 'node2' have NOT exactly the same father */ -ComposedNode *Node::checkHavingCommonFather(Node *node1, Node *node2) throw(YACS::Exception) +ComposedNode *Node::checkHavingCommonFather(Node *node1, Node *node2) { if(node1!=0 && node2!=0) { diff --git a/src/engine/Node.hxx b/src/engine/Node.hxx index 9ec273ff9..c81a4acf9 100644 --- a/src/engine/Node.hxx +++ b/src/engine/Node.hxx @@ -145,33 +145,33 @@ namespace YACS virtual std::list getLocalOutputPorts() const = 0; virtual std::set edGetSetOfUnitializedInputPort() const; virtual bool edAreAllInputPortInitialized() const; - virtual std::string getInPortName(const InPort *) const throw (Exception) = 0; - virtual std::string getOutPortName(const OutPort *) const throw (Exception) = 0; + virtual std::string getInPortName(const InPort *) const = 0; + virtual std::string getOutPortName(const OutPort *) const = 0; virtual std::list getSetOfInputDataStreamPort() const = 0; virtual std::list getSetOfOutputDataStreamPort() const = 0; - InPort *getInPort(const std::string& name) const throw(Exception); - InPropertyPort *getInPropertyPort() const throw(Exception); - virtual OutPort *getOutPort(const std::string& name) const throw(Exception); + InPort *getInPort(const std::string& name) const; + InPropertyPort *getInPropertyPort() const; + virtual OutPort *getOutPort(const std::string& name) const; virtual std::set getAllOutPortsLeavingCurrentScope() const = 0; virtual std::set getAllInPortsComingFromOutsideOfCurrentScope() const = 0; virtual std::vector< std::pair > getSetOfLinksLeavingCurrentScope() const = 0; virtual std::vector< std::pair > getSetOfLinksComingInCurrentScope() const =0; - virtual InputPort *getInputPort(const std::string& name) const throw(Exception); - virtual OutputPort *getOutputPort(const std::string& name) const throw(Exception) = 0; - virtual InputDataStreamPort *getInputDataStreamPort(const std::string& name) const throw(Exception) = 0; - virtual OutputDataStreamPort *getOutputDataStreamPort(const std::string& name) const throw(Exception) = 0; + virtual InputPort *getInputPort(const std::string& name) const; + virtual OutputPort *getOutputPort(const std::string& name) const = 0; + virtual InputDataStreamPort *getInputDataStreamPort(const std::string& name) const = 0; + virtual OutputDataStreamPort *getOutputDataStreamPort(const std::string& name) const = 0; std::list getAllAscendanceOf(ComposedNode *levelToStop = 0) const; bool operator>(const Node& other) const; bool operator<(const Node& other) const; std::string getImplementation() const; DynParaLoop *getClosestDPLAmongAncestors() const; - virtual ComposedNode *getRootNode() const throw(Exception); + virtual ComposedNode *getRootNode() const; virtual void setProperty(const std::string& name,const std::string& value); virtual std::string getProperty(const std::string& name); std::map getProperties() ; std::map getPropertyMap() { return _propertyMap; } virtual void setProperties(std::map properties); - virtual Node *getChildByName(const std::string& name) const throw(Exception) = 0; + virtual Node *getChildByName(const std::string& name) const = 0; virtual Proc *getProc(); virtual const Proc *getProc() const; virtual void accept(Visitor *visitor) = 0; @@ -201,8 +201,8 @@ namespace YACS virtual void exForwardFailed(); virtual void exForwardFinished(); virtual void edDisconnectAllLinksWithMe(); - static void checkValidityOfPortName(const std::string& name) throw(Exception); - static ComposedNode *checkHavingCommonFather(Node *node1, Node *node2) throw(Exception); + static void checkValidityOfPortName(const std::string& name); + static ComposedNode *checkHavingCommonFather(Node *node1, Node *node2); public: static void checkValidityOfNodeName(const std::string& name); }; diff --git a/src/engine/OptimizerAlg.cxx b/src/engine/OptimizerAlg.cxx index 845874cdf..55d62317f 100644 --- a/src/engine/OptimizerAlg.cxx +++ b/src/engine/OptimizerAlg.cxx @@ -31,7 +31,7 @@ OptimizerAlgBase::~OptimizerAlgBase() { } -void OptimizerAlgBase::initialize(const Any *input) throw (YACS::Exception) +void OptimizerAlgBase::initialize(const Any *input) { } @@ -74,7 +74,7 @@ TypeCode * OptimizerAlgBase::getTCForAlgoResultProxy() const return getTCForAlgoResult(); } -void OptimizerAlgBase::initializeProxy(const Any *input) throw (YACS::Exception) +void OptimizerAlgBase::initializeProxy(const Any *input) { initialize(input); } diff --git a/src/engine/OptimizerAlg.hxx b/src/engine/OptimizerAlg.hxx index b7bed1b75..a114934fe 100644 --- a/src/engine/OptimizerAlg.hxx +++ b/src/engine/OptimizerAlg.hxx @@ -60,7 +60,7 @@ namespace YACS virtual TypeCode *getTCForAlgoInit() const; //! returns typecode of type expected as algo result. OwnerShip of returned pointer is held by this. virtual TypeCode *getTCForAlgoResult() const; - virtual void initialize(const Any *input) throw (Exception); + virtual void initialize(const Any *input) ; virtual void start() = 0;//! Update _pool attribute before performing anything. virtual void takeDecision() = 0;//! _pool->getCurrentId gives the \b id at the origin of this call. //! Perform the job of analysing to know what new jobs to do (_pool->pushInSample) @@ -74,7 +74,7 @@ namespace YACS virtual TypeCode *getTCForOutProxy() const; virtual TypeCode *getTCForAlgoInitProxy() const; virtual TypeCode *getTCForAlgoResultProxy() const; - virtual void initializeProxy(const Any *input) throw (Exception); + virtual void initializeProxy(const Any *input) ; virtual void startProxy(); virtual void takeDecisionProxy(); virtual void finishProxy(); diff --git a/src/engine/OptimizerLoop.cxx b/src/engine/OptimizerLoop.cxx index 48fbf9abd..a6ce62157 100644 --- a/src/engine/OptimizerLoop.cxx +++ b/src/engine/OptimizerLoop.cxx @@ -264,7 +264,7 @@ int OptimizerLoop::getNumberOfInputPorts() const return DynParaLoop::getNumberOfInputPorts()+2; } -InputPort *OptimizerLoop::getInputPort(const std::string& name) const throw(YACS::Exception) +InputPort *OptimizerLoop::getInputPort(const std::string& name) const { if (name == NAME_OF_ALGO_INIT_PORT) return (InputPort *)&_algoInitPort; @@ -468,7 +468,7 @@ YACS::Event OptimizerLoop::updateStateOnFailedEventFrom(Node *node, const Execut return DynParaLoop::updateStateOnFailedEventFrom(node,execInst); } -void OptimizerLoop::checkNoCyclePassingThrough(Node *node) throw(YACS::Exception) +void OptimizerLoop::checkNoCyclePassingThrough(Node *node) { } @@ -523,7 +523,7 @@ void OptimizerLoop::checkCFLinks(const std::list& starts, InputPort * } void OptimizerLoop::checkLinkPossibility(OutPort *start, const std::list& pointsOfViewStart, - InPort *end, const std::list& pointsOfViewEnd) throw(YACS::Exception) + InPort *end, const std::list& pointsOfViewEnd) { DynParaLoop::checkLinkPossibility(start, pointsOfViewStart, end, pointsOfViewEnd); std::string linkName("("); @@ -799,7 +799,7 @@ std::string OptimizerLoop::getAlgLib() const /*! * Throw an exception if the node is not valid */ -void OptimizerLoop::checkBasicConsistency() const throw(YACS::Exception) +void OptimizerLoop::checkBasicConsistency() const { DEBTRACE("OptimizerLoop::checkBasicConsistency"); if (_alglib == "") @@ -831,14 +831,14 @@ std::list OptimizerLoop::getLocalOutputPorts() const return ret; } -OutPort * OptimizerLoop::getOutPort(const std::string& name) const throw(YACS::Exception) +OutPort * OptimizerLoop::getOutPort(const std::string& name) const { return (name == NAME_OF_ALGO_RESULT_PORT) ? (OutPort *)&_algoResultPort : DynParaLoop::getOutPort(name); } -OutputPort * OptimizerLoop::getOutputPort(const std::string& name) const throw(YACS::Exception) +OutputPort * OptimizerLoop::getOutputPort(const std::string& name) const { return (name == NAME_OF_ALGO_RESULT_PORT) ? (OutputPort *)&_algoResultPort : DynParaLoop::getOutputPort(name); diff --git a/src/engine/OptimizerLoop.hxx b/src/engine/OptimizerLoop.hxx index 5cad3c4f9..9474cecd5 100644 --- a/src/engine/OptimizerLoop.hxx +++ b/src/engine/OptimizerLoop.hxx @@ -85,25 +85,25 @@ namespace YACS InputPort *edGetPortForOutPool() { return &_retPortForOutPool; } InputPort *edGetAlgoInitPort() { return &_algoInitPort; } OutputPort *edGetAlgoResultPort() { return &_algoResultPort; } - InputPort *getInputPort(const std::string& name) const throw(Exception); + InputPort *getInputPort(const std::string& name) const ; std::list getSetOfInputPort() const; std::list getLocalInputPorts() const; void selectRunnableTasks(std::vector& tasks); void getReadyTasks(std::vector& tasks); YACS::Event updateStateOnFinishedEventFrom(Node *node); - void checkNoCyclePassingThrough(Node *node) throw(Exception); + void checkNoCyclePassingThrough(Node *node) ; virtual void accept(Visitor *visitor); virtual std::string getSymbol() const { return _symbol; } virtual std::string getAlgLib() const ; virtual void setAlgorithm(const std::string& alglib,const std::string& symbol, bool checkLinks=true, Proc * procForTypes = NULL); - virtual void checkBasicConsistency() const throw(Exception); + virtual void checkBasicConsistency() const ; virtual std::string typeName() {return "YACS__ENGINE__OptimizerLoop";} int getNumberOfOutputPorts() const; std::list getSetOfOutputPort() const; std::list getLocalOutputPorts() const; - OutPort *getOutPort(const std::string& name) const throw(Exception); - OutputPort *getOutputPort(const std::string& name) const throw(Exception); + OutPort *getOutPort(const std::string& name) const ; + OutputPort *getOutputPort(const std::string& name) const ; YACS::Event finalize(); protected: virtual YACS::Event updateStateOnFailedEventFrom(Node *node, const Executor *execInst); @@ -116,7 +116,7 @@ namespace YACS LinkInfo& info) const; void checkCFLinks(const std::list& starts, InputPort *end, unsigned char& alreadyFed, bool direction, LinkInfo& info) const; void checkLinkPossibility(OutPort *start, const std::list& pointsOfViewStart, - InPort *end, const std::list& pointsOfViewEnd) throw(Exception); + InPort *end, const std::list& pointsOfViewEnd) ; protected: void cleanInterceptors(); void launchMaxOfSamples(bool first); diff --git a/src/engine/OutGate.cxx b/src/engine/OutGate.cxx index f7a3bb150..1ad30c378 100644 --- a/src/engine/OutGate.cxx +++ b/src/engine/OutGate.cxx @@ -117,7 +117,7 @@ std::list OutGate::edSetInGate() const return ret; } -void OutGate::edRemoveInGate(InGate *inGate, bool coherenceWithInGate) throw(YACS::Exception) +void OutGate::edRemoveInGate(InGate *inGate, bool coherenceWithInGate) { std::list< pair >::iterator iter(std::find_if(_setOfInGate.begin(),_setOfInGate.end(),ItemCmp(inGate))); if(iter==_setOfInGate.end()) diff --git a/src/engine/OutGate.hxx b/src/engine/OutGate.hxx index d6355d6f5..93fdec57c 100644 --- a/src/engine/OutGate.hxx +++ b/src/engine/OutGate.hxx @@ -51,7 +51,7 @@ namespace YACS bool edAddInGate(InGate *inGate); std::list< std::pair< InGate *, bool> >& edMapInGate() { return _setOfInGate; } std::list edSetInGate() const; - void edRemoveInGate(InGate *inGate, bool coherenceWithInGate=true) throw(Exception); + void edRemoveInGate(InGate *inGate, bool coherenceWithInGate=true); int getNbOfInGatesConnected() const; bool isAlreadyInSet(InGate *inGate) const; virtual std::string typeName() {return "YACS__ENGINE__OutGate";} diff --git a/src/engine/OutPort.hxx b/src/engine/OutPort.hxx index 765415608..5f75d3450 100644 --- a/src/engine/OutPort.hxx +++ b/src/engine/OutPort.hxx @@ -44,8 +44,8 @@ namespace YACS virtual std::set edSetInPort() const = 0; virtual bool isAlreadyLinkedWith(InPort *withp) const = 0; virtual void getAllRepresented(std::set& represented) const; - virtual bool addInPort(InPort *inPort) throw(Exception) = 0; - virtual int removeInPort(InPort *inPort, bool forward) throw(Exception) = 0; + virtual bool addInPort(InPort *inPort) = 0; + virtual int removeInPort(InPort *inPort, bool forward) = 0; virtual ~OutPort(); std::vector calculateHistoryOfLinkWith(InPort *end); virtual std::string typeName() {return "YACS__ENGINE__OutPort";} diff --git a/src/engine/OutputDataStreamPort.cxx b/src/engine/OutputDataStreamPort.cxx index 13f91a3f5..649a685f5 100644 --- a/src/engine/OutputDataStreamPort.cxx +++ b/src/engine/OutputDataStreamPort.cxx @@ -84,7 +84,7 @@ string OutputDataStreamPort::getNameOfTypeOfCurrentInstance() const } bool OutputDataStreamPort::edAddInputDataStreamPort(InputDataStreamPort *port) - throw(ConversionException) + { DEBTRACE("OutputDataStreamPort::edAddInputDataStreamPort"); if(!isAlreadyInSet(port)) @@ -105,7 +105,7 @@ bool OutputDataStreamPort::edAddInputDataStreamPort(InputDataStreamPort *port) return false; } -int OutputDataStreamPort::edRemoveInputDataStreamPort(InputDataStreamPort *inPort, bool forward) throw(YACS::Exception) +int OutputDataStreamPort::edRemoveInputDataStreamPort(InputDataStreamPort *inPort, bool forward) { if(forward) { @@ -130,7 +130,7 @@ int OutputDataStreamPort::edRemoveInputDataStreamPort(InputDataStreamPort *inPor } } -bool OutputDataStreamPort::addInPort(InPort *inPort) throw(YACS::Exception) +bool OutputDataStreamPort::addInPort(InPort *inPort) { DEBTRACE("OutputDataStreamPort::addInPort"); if(inPort->getNameOfTypeOfCurrentInstance()!=InputDataStreamPort::NAME) @@ -142,7 +142,7 @@ bool OutputDataStreamPort::addInPort(InPort *inPort) throw(YACS::Exception) return edAddInputDataStreamPort(static_cast(inPort)); } -void OutputDataStreamPort::edRemoveAllLinksLinkedWithMe() throw(YACS::Exception) +void OutputDataStreamPort::edRemoveAllLinksLinkedWithMe() { set::iterator iter; set vec(_setOfInputDataStreamPort); @@ -151,7 +151,7 @@ void OutputDataStreamPort::edRemoveAllLinksLinkedWithMe() throw(YACS::Exception) _setOfInputDataStreamPort.clear(); } -int OutputDataStreamPort::removeInPort(InPort *inPort, bool forward) throw(YACS::Exception) +int OutputDataStreamPort::removeInPort(InPort *inPort, bool forward) { DEBTRACE("OutputDataStreamPort::removeInPort"); if(inPort->getNameOfTypeOfCurrentInstance()!=InputDataStreamPort::NAME && !forward) diff --git a/src/engine/OutputDataStreamPort.hxx b/src/engine/OutputDataStreamPort.hxx index c9d844e7e..2d3febdd9 100644 --- a/src/engine/OutputDataStreamPort.hxx +++ b/src/engine/OutputDataStreamPort.hxx @@ -49,11 +49,11 @@ namespace YACS std::set edSetInPort() const; bool isAlreadyLinkedWith(InPort *withp) const; virtual std::string getNameOfTypeOfCurrentInstance() const; - virtual bool addInPort(InPort *inPort) throw(Exception); - virtual bool edAddInputDataStreamPort(InputDataStreamPort *port) throw(ConversionException); - int edRemoveInputDataStreamPort(InputDataStreamPort *inPort, bool forward) throw(Exception); - void edRemoveAllLinksLinkedWithMe() throw(Exception); - int removeInPort(InPort *inPort, bool forward) throw(Exception); + virtual bool addInPort(InPort *inPort) ; + virtual bool edAddInputDataStreamPort(InputDataStreamPort *port); + int edRemoveInputDataStreamPort(InputDataStreamPort *inPort, bool forward) ; + void edRemoveAllLinksLinkedWithMe() ; + int removeInPort(InPort *inPort, bool forward) ; virtual std::string typeName() {return "YACS__ENGINE__OutputDataStreamPort";} private: bool isAlreadyInSet(InputDataStreamPort *inPort) const; diff --git a/src/engine/OutputPort.cxx b/src/engine/OutputPort.cxx index ad964309f..670bd23bd 100644 --- a/src/engine/OutputPort.cxx +++ b/src/engine/OutputPort.cxx @@ -50,7 +50,7 @@ string OutputPort::getNameOfTypeOfCurrentInstance() const return NAME; } -void OutputPort::edRemoveAllLinksLinkedWithMe() throw(YACS::Exception) +void OutputPort::edRemoveAllLinksLinkedWithMe() { set::iterator iter; set vec(_setOfInputPort); @@ -63,7 +63,7 @@ void OutputPort::exInit() { } -void OutputPort::put(const void *data) throw(ConversionException) +void OutputPort::put(const void *data) { for(set::iterator iter = _setOfInputPort.begin(); iter != _setOfInputPort.end(); iter++) (*iter)->put(data); @@ -72,7 +72,7 @@ void OutputPort::put(const void *data) throw(ConversionException) /** * check if output type is an input type and if a data converter exists before link */ -bool OutputPort::edAddInputPort(InputPort *phyPort) throw(YACS::Exception) +bool OutputPort::edAddInputPort(InputPort *phyPort) { DEBTRACE("OutputPort::edAddInputPort"); if(!isAlreadyInSet(phyPort)) @@ -89,7 +89,7 @@ bool OutputPort::edAddInputPort(InputPort *phyPort) throw(YACS::Exception) return false; } -bool OutputPort::edAddInPropertyPort(InPropertyPort *phyPort) throw(YACS::Exception) +bool OutputPort::edAddInPropertyPort(InPropertyPort *phyPort) { DEBTRACE("OutputPort::edAddInPropertyPort"); if(!isAlreadyInSet(phyPort)) @@ -111,7 +111,7 @@ bool OutputPort::edAddInPropertyPort(InPropertyPort *phyPort) throw(YACS::Except * If 'forward' == true the forward deletion * If 'forward' == false no forward deletion performed, oneway deletion without update 'inputPort' side. */ -int OutputPort::edRemoveInputPort(InputPort *inputPort, bool forward) throw(YACS::Exception) +int OutputPort::edRemoveInputPort(InputPort *inputPort, bool forward) { if(forward) { @@ -202,7 +202,7 @@ OutputPort::isConnected() const /** * check compatibility of port class ( an inputPort ) before trying to create the link. */ -bool OutputPort::addInPort(InPort *inPort) throw(YACS::Exception) +bool OutputPort::addInPort(InPort *inPort) { DEBTRACE("OutputPort::addInPort"); if(inPort->getNameOfTypeOfCurrentInstance()!=InputPort::NAME && @@ -225,7 +225,7 @@ bool OutputPort::addInPort(InPort *inPort) throw(YACS::Exception) /** * check compatibility of port class ( an inputPort ) before trying to remove link WITHOUT forward. */ -int OutputPort::removeInPort(InPort *inPort, bool forward) throw(YACS::Exception) +int OutputPort::removeInPort(InPort *inPort, bool forward) { if(inPort->getNameOfTypeOfCurrentInstance()!=InputPort::NAME && !forward) { @@ -258,6 +258,6 @@ const std::set& OutputPort::getSetOfPhyLinks() const } //! Check validity of output port. Nothing on base class -void OutputPort::checkBasicConsistency() const throw(YACS::Exception) +void OutputPort::checkBasicConsistency() const { } diff --git a/src/engine/OutputPort.hxx b/src/engine/OutputPort.hxx index eb3f25f7b..93ae48d01 100644 --- a/src/engine/OutputPort.hxx +++ b/src/engine/OutputPort.hxx @@ -54,18 +54,18 @@ namespace YACS bool isAlreadyInSet(InputPort *inputPort) const; bool isConnected() const; std::string getNameOfTypeOfCurrentInstance() const; - int removeInPort(InPort *inPort, bool forward) throw(Exception); - virtual bool edAddInputPort(InputPort *phyPort) throw(Exception); - virtual bool edAddInPropertyPort(InPropertyPort *phyPort) throw(Exception); - virtual int edRemoveInputPort(InputPort *inputPort, bool forward) throw(Exception); - bool addInPort(InPort *inPort) throw(Exception); - void edRemoveAllLinksLinkedWithMe() throw(Exception);//entry point for forward port deletion + int removeInPort(InPort *inPort, bool forward) ; + virtual bool edAddInputPort(InputPort *phyPort) ; + virtual bool edAddInPropertyPort(InPropertyPort *phyPort) ; + virtual int edRemoveInputPort(InputPort *inputPort, bool forward) ; + bool addInPort(InPort *inPort) ; + void edRemoveAllLinksLinkedWithMe() ;//entry point for forward port deletion virtual void exInit(); - virtual void checkBasicConsistency() const throw(Exception); + virtual void checkBasicConsistency() const ; virtual OutputPort *clone(Node *newHelder) const = 0; virtual std::string dump(); - virtual void put(const void *data) throw(ConversionException); + virtual void put(const void *data); virtual std::string typeName() {return "YACS__ENGINE__OutputPort";} protected: diff --git a/src/engine/Plugin/PluginSimplex.cxx b/src/engine/Plugin/PluginSimplex.cxx index 36ac3abd0..2f75f40e6 100644 --- a/src/engine/Plugin/PluginSimplex.cxx +++ b/src/engine/Plugin/PluginSimplex.cxx @@ -96,7 +96,7 @@ void PluginSimplex::takeDecision() rien = solv->next(); } -void PluginSimplex::initialize(const Any *input) throw(YACS::Exception) +void PluginSimplex::initialize(const Any *input) { } diff --git a/src/engine/Plugin/PluginSimplex.hxx b/src/engine/Plugin/PluginSimplex.hxx index 045febbe7..a9e241998 100644 --- a/src/engine/Plugin/PluginSimplex.hxx +++ b/src/engine/Plugin/PluginSimplex.hxx @@ -59,7 +59,7 @@ namespace YACS void parseFileToInit(const std::string& fileName); void start(); void takeDecision(); - void initialize(const Any *input) throw(Exception); + void initialize(const Any *input) ; void finish(); }; } diff --git a/src/engine/Pool.cxx b/src/engine/Pool.cxx index c4c7a8854..29b1a72df 100644 --- a/src/engine/Pool.cxx +++ b/src/engine/Pool.cxx @@ -137,7 +137,7 @@ void Pool::destroyCurrentCase() * corrupted 'this'. * */ -void Pool::checkConsistency() throw(YACS::Exception) +void Pool::checkConsistency() { // First check unicity of ids. std::set ids; @@ -157,7 +157,7 @@ void Pool::checkConsistency() throw(YACS::Exception) /*! * \throw See the \b throw case of pushOutSampleAt method. */ -void Pool::setCurrentId(int id) throw(YACS::Exception) +void Pool::setCurrentId(int id) { std::list< std::pair >::iterator iter; for(iter=_container.begin();iter!=_container.end();iter++) @@ -178,7 +178,7 @@ void Pool::setCurrentId(int id) throw(YACS::Exception) * has destroyed a case id different from its id. * */ -void Pool::putOutSampleAt(int id, Any *outValue) throw(YACS::Exception) +void Pool::putOutSampleAt(int id, Any *outValue) { std::list< std::pair >::iterator iter; for(iter=_container.begin();iter!=_container.end();iter++) diff --git a/src/engine/Pool.hxx b/src/engine/Pool.hxx index 6e9e1ca97..342399956 100644 --- a/src/engine/Pool.hxx +++ b/src/engine/Pool.hxx @@ -76,9 +76,9 @@ namespace YACS private: //For OptimizerNode use void destroyCurrentCase(); - void checkConsistency() throw(Exception); - void setCurrentId(int id) throw(Exception); - void putOutSampleAt(int id, Any *outValue) throw(Exception); + void checkConsistency() ; + void setCurrentId(int id) ; + void putOutSampleAt(int id, Any *outValue) ; Any *getNextSampleWithHighestPriority(int& id, unsigned char& priority) const; void markIdAsInUse(int id); bool empty() const; diff --git a/src/engine/Runtime.cxx b/src/engine/Runtime.cxx index 4d9d39991..8fca6442c 100644 --- a/src/engine/Runtime.cxx +++ b/src/engine/Runtime.cxx @@ -58,7 +58,7 @@ const char Runtime::RUNTIME_ENGINE_INTERACTION_IMPL_NAME[]="Neutral"; // singleton creation must be done before by a derived class -Runtime* YACS::ENGINE::getRuntime() throw(Exception) +Runtime* YACS::ENGINE::getRuntime() { if ( ! Runtime::_singleton ) throw Exception("Runtime is not yet initialized"); diff --git a/src/engine/Runtime.hxx b/src/engine/Runtime.hxx index 8d354262e..9b5019504 100644 --- a/src/engine/Runtime.hxx +++ b/src/engine/Runtime.hxx @@ -34,7 +34,7 @@ namespace YACS namespace ENGINE { class Runtime; - YACSLIBENGINE_EXPORT Runtime* getRuntime() throw(Exception); + YACSLIBENGINE_EXPORT Runtime* getRuntime() ; class Any; class InputPort; @@ -67,7 +67,7 @@ namespace YACS class YACSLIBENGINE_EXPORT Runtime { - friend Runtime* getRuntime() throw(Exception); + friend Runtime* getRuntime() ; public: virtual void init() { } virtual void fini() { } @@ -119,12 +119,12 @@ namespace YACS TypeCode * type); virtual InputPort* adapt(InputPort* source, const std::string& impl, TypeCode * type, - bool init=false) throw (ConversionException) = 0; + bool init=false) = 0; virtual InputPort* adapt(InPropertyPort* source, const std::string& impl, TypeCode * type, - bool init=false) throw (ConversionException) = 0; + bool init=false) = 0; virtual void* convertNeutral(TypeCode * type, Any *data); virtual std::string convertNeutralAsString(TypeCode * type, Any *data); diff --git a/src/engine/ServiceNode.cxx b/src/engine/ServiceNode.cxx index 16c77e8b8..fea349f43 100644 --- a/src/engine/ServiceNode.cxx +++ b/src/engine/ServiceNode.cxx @@ -143,7 +143,7 @@ bool ServiceNode::isDeployable() const } //! Associate an existing component instance to this service node \b AND check the consistency regarding the deployment from root node point of view. -void ServiceNode::setComponent(ComponentInstance* compo) throw(YACS::Exception) +void ServiceNode::setComponent(ComponentInstance* compo) { DEBTRACE("ServiceNode::setComponent " << compo); if(compo) diff --git a/src/engine/ServiceNode.hxx b/src/engine/ServiceNode.hxx index 736f82111..74fae37c1 100644 --- a/src/engine/ServiceNode.hxx +++ b/src/engine/ServiceNode.hxx @@ -41,7 +41,7 @@ namespace YACS public: virtual void load(); virtual bool isDeployable() const; - virtual void setComponent(ComponentInstance* compo) throw(Exception); + virtual void setComponent(ComponentInstance* compo) ; virtual ComponentInstance *getComponent(); virtual const ComponentInstance *getComponent() const; virtual Container *getContainer(); diff --git a/src/engine/Switch.cxx b/src/engine/Switch.cxx index 314c61927..d7c6f2d21 100644 --- a/src/engine/Switch.cxx +++ b/src/engine/Switch.cxx @@ -60,7 +60,7 @@ std::string CollectorSwOutPort::getNameOfTypeOfCurrentInstance() const return _className; } -void CollectorSwOutPort::edRemoveAllLinksLinkedWithMe() throw(YACS::Exception) +void CollectorSwOutPort::edRemoveAllLinksLinkedWithMe() { map::iterator pt; if(_consumer) @@ -80,7 +80,7 @@ void CollectorSwOutPort::getAllRepresented(std::set& represented) con ((*pt).second)->getAllRepresented(represented); } -bool CollectorSwOutPort::addInPort(InPort *inPort) throw(YACS::Exception) +bool CollectorSwOutPort::addInPort(InPort *inPort) { if(_currentProducer) {//a specific link is beeing done @@ -93,7 +93,7 @@ bool CollectorSwOutPort::addInPort(InPort *inPort) throw(YACS::Exception) (*iter).second->addInPort(inPort); } -int CollectorSwOutPort::removeInPort(InPort *inPort, bool forward) throw(YACS::Exception) +int CollectorSwOutPort::removeInPort(InPort *inPort, bool forward) { if(_currentProducer) { @@ -180,7 +180,7 @@ bool CollectorSwOutPort::removePotentialProducerForMaster() return _potentialProducers.empty(); } -bool CollectorSwOutPort::checkManagementOfPort(OutPort *port) throw(YACS::Exception) +bool CollectorSwOutPort::checkManagementOfPort(OutPort *port) { for(map::iterator iter=_potentialProducers.begin();iter!=_potentialProducers.end();iter++) if((*iter).second==port) @@ -425,7 +425,7 @@ void Switch::partitionRegardingDPL(const PartDefinition *pd, std::mappartitionRegardingDPL(pd,zeMap); } -void Switch::edRemoveChild(Node *node) throw(YACS::Exception) +void Switch::edRemoveChild(Node *node) { map< int , Node * >::iterator iter=_mapOfNode.begin(); for(;iter!=_mapOfNode.end();iter++) @@ -452,7 +452,7 @@ std::list Switch::getLocalInputPorts() const ret.push_back((InputPort *)&_condition); return ret; } -OutPort *Switch::getOutPort(const std::string& name) const throw(YACS::Exception) +OutPort *Switch::getOutPort(const std::string& name) const { for(map::const_iterator iter=_outPortsCollector.begin();iter!=_outPortsCollector.end();iter++) if(name==(*iter).second->getName()) @@ -463,14 +463,14 @@ OutPort *Switch::getOutPort(const std::string& name) const throw(YACS::Exception return StaticDefinedComposedNode::getOutPort(name); } -InputPort *Switch::getInputPort(const std::string& name) const throw(YACS::Exception) +InputPort *Switch::getInputPort(const std::string& name) const { if(name==SELECTOR_INPUTPORT_NAME) return (InputPort *)&_condition; return StaticDefinedComposedNode::getInputPort(name); } -Node *Switch::getChildByShortName(const std::string& name) const throw(YACS::Exception) +Node *Switch::getChildByShortName(const std::string& name) const { if(name==DEFAULT_NODE_NAME) { @@ -497,12 +497,12 @@ Node *Switch::edSetDefaultNode(Node *node) return edSetNode(ID_FOR_DEFAULT_NODE,node); } -Node *Switch::edReleaseDefaultNode() throw(YACS::Exception) +Node *Switch::edReleaseDefaultNode() { return edReleaseCase(ID_FOR_DEFAULT_NODE); } -Node *Switch::edReleaseCase(int caseId) throw(YACS::Exception) +Node *Switch::edReleaseCase(int caseId) { map< int , Node * >::iterator iter=_mapOfNode.find(caseId); if(iter==_mapOfNode.end()) @@ -534,7 +534,7 @@ Node *Switch::edGetNode(int caseId) * 0 is returned if caseId is a new ID. * \b WARNING : 'node' is held by 'this' after call, whereas returned node is no more held. */ -Node *Switch::edSetNode(int caseId, Node *node) throw(YACS::Exception) +Node *Switch::edSetNode(int caseId, Node *node) { if(!node) throw Exception("Switch::edSetNode : null node cannot be set as a case in switch node"); @@ -625,7 +625,7 @@ list Switch::getProgressWeight() const return ret; } -bool Switch::edAddChild(Node *node) throw(YACS::Exception) +bool Switch::edAddChild(Node *node) { int aCase = getMaxCase() + 1; DEBTRACE(aCase); @@ -682,13 +682,13 @@ void Switch::checkControlDependancy(OutPort *start, InPort *end, bool cross, throw Exception("Switch::checkControlDependancy : a link was dectected between 2 cases of a switch. Impossible !"); } -void Switch::checkNoCyclePassingThrough(Node *node) throw(YACS::Exception) +void Switch::checkNoCyclePassingThrough(Node *node) { throw Exception("Switch::checkNoCyclePassingThrough : uncorrect control flow link relative to switch"); } void Switch::checkLinkPossibility(OutPort *start, const std::list& pointsOfViewStart, - InPort *end, const std::list& pointsOfViewEnd) throw(YACS::Exception) + InPort *end, const std::list& pointsOfViewEnd) { throw Exception("Switch::checkLinkPossibility : A link between 2 different cases of a same Switch requested -> Impossible"); } @@ -710,7 +710,7 @@ void Switch::buildDelegateOf(std::pair& port, InPort *fina port.first=newCollector; } -void Switch::getDelegateOf(std::pair& port, InPort *finalTarget, const std::list& pointsOfView) throw(YACS::Exception) +void Switch::getDelegateOf(std::pair& port, InPort *finalTarget, const std::list& pointsOfView) { map::iterator iter=_outPortsCollector.find(finalTarget); if(iter==_outPortsCollector.end()) @@ -724,7 +724,7 @@ void Switch::getDelegateOf(std::pair& port, InPort *finalT port.first=(*iter).second; } -void Switch::releaseDelegateOf(OutPort *portDwn, OutPort *portUp, InPort *finalTarget, const std::list& pointsOfView) throw(YACS::Exception) +void Switch::releaseDelegateOf(OutPort *portDwn, OutPort *portUp, InPort *finalTarget, const std::list& pointsOfView) { set repr; portDwn->getAllRepresented(repr); @@ -811,7 +811,7 @@ std::string Switch::getMyQualifiedName(const Node *directSon) const return id; } -std::string Switch::getCaseId(const Node *node) const throw(YACS::Exception) +std::string Switch::getCaseId(const Node *node) const { const char sep='_'; map::const_iterator iter; diff --git a/src/engine/Switch.hxx b/src/engine/Switch.hxx index 02516e867..ba94f6e40 100644 --- a/src/engine/Switch.hxx +++ b/src/engine/Switch.hxx @@ -42,11 +42,11 @@ namespace YACS std::set edSetInPort() const; bool isAlreadyLinkedWith(InPort *withp) const; std::string getNameOfTypeOfCurrentInstance() const; - void edRemoveAllLinksLinkedWithMe() throw(Exception); + void edRemoveAllLinksLinkedWithMe() ; TypeOfChannel getTypeOfChannel() const; void getAllRepresented(std::set& represented) const; - bool addInPort(InPort *inPort) throw(Exception); - int removeInPort(InPort *inPort, bool forward) throw(Exception); + bool addInPort(InPort *inPort) ; + int removeInPort(InPort *inPort, bool forward) ; public: void getHumanReprOfIncompleteCases(std::ostream& stream) const; private://Specific part @@ -55,7 +55,7 @@ namespace YACS CollectorSwOutPort(Switch *master, InPort *port); CollectorSwOutPort(const CollectorSwOutPort& other, Switch *master); void addPotentialProducerForMaster(OutPort *port); - bool checkManagementOfPort(OutPort *port) throw(Exception); + bool checkManagementOfPort(OutPort *port) ; private: InPort *_consumer; std::string _className; @@ -103,12 +103,12 @@ namespace YACS void init(bool start=true); //Node* DISOWNnode is a SWIG notation to indicate that the ownership of the node is transfered to C++ Node *edSetDefaultNode(Node *DISOWNnode); - Node *edReleaseDefaultNode() throw(Exception); - Node *edReleaseCase(int caseId) throw(Exception); + Node *edReleaseDefaultNode() ; + Node *edReleaseCase(int caseId) ; Node *edGetNode(int caseId); - Node *edSetNode(int caseId, Node *DISOWNnode) throw(Exception); + Node *edSetNode(int caseId, Node *DISOWNnode) ; void edChangeCase(int oldCase, int newCase); - virtual bool edAddChild(Node *DISOWNnode) throw(Exception); + virtual bool edAddChild(Node *DISOWNnode) ; int getMaxCase(); void getReadyTasks(std::vector& tasks); std::list edGetDirectDescendants() const; @@ -118,16 +118,16 @@ namespace YACS int getMaxLevelOfParallelism() const; void getWeightRegardingDPL(ComplexWeight *weight); void partitionRegardingDPL(const PartDefinition *pd, std::map >& zeMap); - void edRemoveChild(Node *node) throw(Exception); + void edRemoveChild(Node *node) ; std::list getSetOfInputPort() const; std::list getLocalInputPorts() const; YACS::StatesForNode getEffectiveState() const; YACS::StatesForNode getEffectiveState(const Node* node) const; - OutPort *getOutPort(const std::string& name) const throw(Exception); - InputPort* getInputPort(const std::string& name) const throw(Exception); - Node *getChildByShortName(const std::string& name) const throw(Exception); + OutPort *getOutPort(const std::string& name) const ; + InputPort* getInputPort(const std::string& name) const ; + Node *getChildByShortName(const std::string& name) const ; std::string getMyQualifiedName(const Node *directSon) const; - std::string getCaseId(const Node *node) const throw(Exception); + std::string getCaseId(const Node *node) const ; virtual void accept(Visitor *visitor); int getRankOfNode(Node *node) const; virtual std::string typeName() {return "YACS__ENGINE__Switch";} @@ -137,17 +137,17 @@ namespace YACS Node *simpleClone(ComposedNode *father, bool editionOnly=true) const; std::set getAllInPortsComingFromOutsideOfCurrentScope() const; void checkLinkPossibility(OutPort *start, const std::list& pointsOfViewStart, - InPort *end, const std::list& pointsOfViewEnd) throw(Exception); + InPort *end, const std::list& pointsOfViewEnd) ; void buildDelegateOf(std::pair& port, InPort *finalTarget, const std::list& pointsOfView); - void getDelegateOf(std::pair& port, InPort *finalTarget, const std::list& pointsOfView) throw(Exception); - void releaseDelegateOf(OutPort *portDwn, OutPort *portUp, InPort *finalTarget, const std::list& pointsOfView) throw(Exception); + void getDelegateOf(std::pair& port, InPort *finalTarget, const std::list& pointsOfView) ; + void releaseDelegateOf(OutPort *portDwn, OutPort *portUp, InPort *finalTarget, const std::list& pointsOfView) ; void checkCFLinks(const std::list& starts, InputPort *end, unsigned char& alreadyFed, bool direction, LinkInfo& info) const; void checkControlDependancy(OutPort *start, InPort *end, bool cross, std::map < ComposedNode *, std::list < OutPort * > >& fw, std::vector& fwCross, std::map< ComposedNode *, std::list < OutPort *> >& bw, LinkInfo& info) const; - void checkNoCyclePassingThrough(Node *node) throw(Exception); + void checkNoCyclePassingThrough(Node *node) ; private: int getNbOfCases() const; static std::string getRepresentationOfCase(int i); diff --git a/src/engine/Test/ContainerTest.cxx b/src/engine/Test/ContainerTest.cxx index 3542a140a..a5805b9d2 100644 --- a/src/engine/Test/ContainerTest.cxx +++ b/src/engine/Test/ContainerTest.cxx @@ -54,7 +54,7 @@ bool ContainerTest::isAlreadyStarted(const Task *askingNode) const return _alreadyStarted; } -void ContainerTest::start(const Task *askingNode) throw(YACS::Exception) +void ContainerTest::start(const Task *askingNode) { if(_alreadyStarted) throw Exception("ContainerTest already started !!!!"); @@ -77,7 +77,7 @@ Container *ContainerTest::cloneAlways() const return new ContainerTest; } -void ContainerTest::checkCapabilityToDealWith(const ComponentInstance *inst) const throw(YACS::Exception) +void ContainerTest::checkCapabilityToDealWith(const ComponentInstance *inst) const { if(inst->getKind()!=SUPPORTED_COMP_KIND) throw Exception("ContainerTest not compatible with this type of instance."); @@ -102,7 +102,7 @@ bool ContainerTest2::isAlreadyStarted(const Task *askingNode) const return _alreadyStarted; } -void ContainerTest2::start(const Task *askingNode) throw(YACS::Exception) +void ContainerTest2::start(const Task *askingNode) { if(_alreadyStarted) throw Exception("ContainerTest already started !!!!"); @@ -130,7 +130,7 @@ void ContainerTest2::initAllContainers() _counter=0; } -void ContainerTest2::checkCapabilityToDealWith(const ComponentInstance *inst) const throw(YACS::Exception) +void ContainerTest2::checkCapabilityToDealWith(const ComponentInstance *inst) const { if(inst->getKind()!=SUPPORTED_COMP_KIND) throw Exception("ContainerTest not compatible with this type of instance."); diff --git a/src/engine/Test/ContainerTest.hxx b/src/engine/Test/ContainerTest.hxx index 2935c6b65..db64ad4e8 100644 --- a/src/engine/Test/ContainerTest.hxx +++ b/src/engine/Test/ContainerTest.hxx @@ -34,7 +34,7 @@ namespace YACS std::string getPlacementInfo() const; // implementation of compulsary methods bool isAlreadyStarted(const Task *askingNode) const; - void start(const Task *askingNode) throw(Exception); + void start(const Task *askingNode) ; Container *clone() const; Container *cloneAlways() const; // @@ -52,7 +52,7 @@ namespace YACS std::string getFullPlacementId(const Task *askingNode) const { return ""; } static void initAllContainers(); protected: - void checkCapabilityToDealWith(const ComponentInstance *inst) const throw(Exception); + void checkCapabilityToDealWith(const ComponentInstance *inst) const ; protected: bool _alreadyStarted; unsigned _myCounter; @@ -67,7 +67,7 @@ namespace YACS std::string getKind() const; // implementation of compulsary methods bool isAlreadyStarted(const Task *askingNode) const; - void start(const Task *askingNode) throw(Exception); + void start(const Task *askingNode) ; Container *clone() const; Container *cloneAlways() const; // @@ -85,7 +85,7 @@ namespace YACS std::string getFullPlacementId(const Task *askingNode) const { return ""; } static void initAllContainers(); protected: - void checkCapabilityToDealWith(const ComponentInstance *inst) const throw(Exception); + void checkCapabilityToDealWith(const ComponentInstance *inst) const ; protected: bool _alreadyStarted; unsigned _myCounter; diff --git a/src/engine/Test/PluginOptEvTest1.cxx b/src/engine/Test/PluginOptEvTest1.cxx index 4e0ff1f35..41fdab3ae 100644 --- a/src/engine/Test/PluginOptEvTest1.cxx +++ b/src/engine/Test/PluginOptEvTest1.cxx @@ -99,7 +99,7 @@ void PluginOptEvTest1::takeDecision() _idTest++; } -void PluginOptEvTest1::initialize(const Any *input) throw(YACS::Exception) +void PluginOptEvTest1::initialize(const Any *input) { } diff --git a/src/engine/Test/PluginOptEvTest1.hxx b/src/engine/Test/PluginOptEvTest1.hxx index b645bfd65..d0d254365 100644 --- a/src/engine/Test/PluginOptEvTest1.hxx +++ b/src/engine/Test/PluginOptEvTest1.hxx @@ -47,7 +47,7 @@ namespace YACS void parseFileToInit(const std::string& fileName); void start(); void takeDecision(); - void initialize(const Any *input) throw(Exception); + void initialize(const Any *input) ; void finish(); }; } diff --git a/src/engine/Test/RuntimeForEngineIntegrationTest.cxx b/src/engine/Test/RuntimeForEngineIntegrationTest.cxx index 159e56f46..a9ae6e2b4 100644 --- a/src/engine/Test/RuntimeForEngineIntegrationTest.cxx +++ b/src/engine/Test/RuntimeForEngineIntegrationTest.cxx @@ -45,7 +45,7 @@ std::vector< std::pair > RuntimeForEngineIntegrationTest::getCa // throw Exception("RuntimeForEngineTest::getCatalogOfComputeNodes : not implemented !"); } -ElementaryNode* RuntimeForEngineIntegrationTest::createNode(const std::string& implementation, const std::string& name) throw (YACS::Exception) +ElementaryNode* RuntimeForEngineIntegrationTest::createNode(const std::string& implementation, const std::string& name) { if (implementation == ToyNode::MY_IMPL_NAME) return new ToyNode(name); @@ -85,12 +85,12 @@ OutputPort* RuntimeForEngineIntegrationTest::createOutputPort(const std::string& throw Exception(msg.str()); } -InputPort* RuntimeForEngineIntegrationTest::adapt(InputPort* source, const std::string& impl,TypeCode * type,bool init) throw (ConversionException) +InputPort* RuntimeForEngineIntegrationTest::adapt(InputPort* source, const std::string& impl,TypeCode * type,bool init) { return new ProxyPort(source); } -InputPort* RuntimeForEngineIntegrationTest::adapt(InPropertyPort* source, const std::string& impl, TypeCode * type, bool init) throw (ConversionException) +InputPort* RuntimeForEngineIntegrationTest::adapt(InPropertyPort* source, const std::string& impl, TypeCode * type, bool init) { return adapt((InputPort *)source, impl, type, init); } diff --git a/src/engine/Test/RuntimeForEngineIntegrationTest.hxx b/src/engine/Test/RuntimeForEngineIntegrationTest.hxx index 5821da9d0..22996d52c 100644 --- a/src/engine/Test/RuntimeForEngineIntegrationTest.hxx +++ b/src/engine/Test/RuntimeForEngineIntegrationTest.hxx @@ -31,11 +31,11 @@ namespace YACS public: static void setRuntime(); std::vector< std::pair > getCatalogOfComputeNodes() const; - ElementaryNode* createNode(const std::string& implementation, const std::string& name) throw(Exception); + ElementaryNode* createNode(const std::string& implementation, const std::string& name) ; InputPort* createInputPort(const std::string& name, const std::string& impl, Node * node, TypeCode * type); OutputPort* createOutputPort(const std::string& name, const std::string& impl, Node * node, TypeCode * type); - InputPort* adapt(InputPort* source, const std::string& impl,TypeCode * type,bool init) throw (ConversionException); - InputPort* adapt(InPropertyPort* source, const std::string& impl, TypeCode * type,bool init) throw (ConversionException); + InputPort* adapt(InputPort* source, const std::string& impl,TypeCode * type,bool init); + InputPort* adapt(InPropertyPort* source, const std::string& impl, TypeCode * type,bool init); ComponentInstance* createComponentInstance(const std::string& name, const std::string& kind=""); }; } diff --git a/src/engine/Test/RuntimeForEngineTest.cxx b/src/engine/Test/RuntimeForEngineTest.cxx index 45eff9e91..4058da812 100644 --- a/src/engine/Test/RuntimeForEngineTest.cxx +++ b/src/engine/Test/RuntimeForEngineTest.cxx @@ -48,7 +48,7 @@ void TestElemInputPort::releaseData() throw Exception(msg.str()); } -void TestElemInputPort::put(const void *data) throw(ConversionException) +void TestElemInputPort::put(const void *data) { cerr << _name << endl; stringstream msg; @@ -61,7 +61,7 @@ InputPort *TestElemInputPort::clone(Node *newHelder) const return new TestElemInputPort(*this,newHelder); } -void *TestElemInputPort::get() const throw(YACS::Exception) +void *TestElemInputPort::get() const { stringstream msg; msg << "Not implemented (" << __FILE__ << ":" << __LINE__ << ")"; @@ -99,7 +99,7 @@ OutputPort *TestElemOutputPort::clone(Node *newHelder) const return new TestElemOutputPort(*this,newHelder); } -void TestElemOutputPort::put(const void *data) throw(ConversionException) +void TestElemOutputPort::put(const void *data) { cerr << _name << endl; stringstream msg; @@ -124,7 +124,7 @@ std::vector< std::pair > RuntimeForEngineTest::getCatalogOfComp // throw Exception("RuntimeForEngineTest::getCatalogOfComputeNodes : not implemented !"); } -ElementaryNode* RuntimeForEngineTest::createNode(const string& implementation, const string& name) throw(YACS::Exception) +ElementaryNode* RuntimeForEngineTest::createNode(const string& implementation, const string& name) { return new TestElemNode(name); } @@ -139,12 +139,12 @@ OutputPort* RuntimeForEngineTest::createOutputPort(const string& name, const str return new TestElemOutputPort(name, node, type); } -InputPort* RuntimeForEngineTest::adapt(InputPort* source, const string& impl,TypeCode * type,bool init) throw (ConversionException) +InputPort* RuntimeForEngineTest::adapt(InputPort* source, const string& impl,TypeCode * type,bool init) { return new ProxyPort(source); } -InputPort* RuntimeForEngineTest::adapt(InPropertyPort* source, const std::string& impl, TypeCode * type, bool init) throw (ConversionException) +InputPort* RuntimeForEngineTest::adapt(InPropertyPort* source, const std::string& impl, TypeCode * type, bool init) { return adapt((InputPort *)source,impl,type,init); } diff --git a/src/engine/Test/RuntimeForEngineTest.hxx b/src/engine/Test/RuntimeForEngineTest.hxx index e8c3a8912..0c27f5522 100644 --- a/src/engine/Test/RuntimeForEngineTest.hxx +++ b/src/engine/Test/RuntimeForEngineTest.hxx @@ -45,9 +45,9 @@ namespace YACS TestElemInputPort(const std::string& name, Node *node, TypeCode* type); TestElemInputPort(const TestElemInputPort& other, Node *newHelder); void releaseData() override; - void put(const void *data) throw(ConversionException); + void put(const void *data); InputPort *clone(Node *newHelder) const; - void *get() const throw(Exception); + void *get() const ; void exRestoreInit(); void exSaveInit(); protected: @@ -59,7 +59,7 @@ namespace YACS public: TestElemOutputPort(const std::string& name, Node *node, TypeCode* type); TestElemOutputPort(const TestElemOutputPort& other, Node *newHelder); - void put(const void *data) throw(ConversionException); + void put(const void *data); OutputPort *clone(Node *newHelder) const; }; @@ -68,11 +68,11 @@ namespace YACS public: static void setRuntime(); std::vector< std::pair > getCatalogOfComputeNodes() const; - ElementaryNode* createNode(const std::string& implementation, const std::string& name) throw(Exception); + ElementaryNode* createNode(const std::string& implementation, const std::string& name) ; InputPort* createInputPort(const std::string& name, const std::string& impl, Node * node, TypeCode * type); OutputPort* createOutputPort(const std::string& name, const std::string& impl, Node * node, TypeCode * type); - InputPort* adapt(InputPort* source, const std::string& impl, TypeCode * type,bool init) throw (ConversionException); - InputPort* adapt(InPropertyPort* source, const std::string& impl, TypeCode * type,bool init) throw (ConversionException); + InputPort* adapt(InputPort* source, const std::string& impl, TypeCode * type,bool init); + InputPort* adapt(InPropertyPort* source, const std::string& impl, TypeCode * type,bool init); }; } } diff --git a/src/engine/Test/ToyNode.cxx b/src/engine/Test/ToyNode.cxx index f489ed901..e4d93bead 100644 --- a/src/engine/Test/ToyNode.cxx +++ b/src/engine/Test/ToyNode.cxx @@ -67,7 +67,7 @@ InputToyPort::InputToyPort(const string& name, Node *node):InputPort(name, node, { } -void InputToyPort::put(const void *data) throw(ConversionException) +void InputToyPort::put(const void *data) { put((Any *)data); } @@ -77,7 +77,7 @@ bool InputToyPort::edIsManuallyInitialized() const return _initData!=0; } -void *InputToyPort::get() const throw(YACS::Exception) +void *InputToyPort::get() const { return (void *)_data; } @@ -142,7 +142,7 @@ OutputToyPort::OutputToyPort(const OutputToyPort& other, Node *newHelder):Output _data=other._data->clone(); } -void OutputToyPort::put(const void *data) throw(ConversionException) +void OutputToyPort::put(const void *data) { put((Any *)data); OutputPort::put(data); @@ -221,7 +221,7 @@ int ToyNode::getNumberOfOutputPorts() const return ElementaryNode::getNumberOfInputPorts()+1; } -OutputPort *ToyNode::getOutputPort(const std::string& name) const throw(YACS::Exception) +OutputPort *ToyNode::getOutputPort(const std::string& name) const { if(name==NAME_FOR_NB) return (OutputPort *)&_nbOfInputsPort; @@ -337,7 +337,7 @@ std::list SeqToyNode::getSetOfInputPort() const return ret; } -InputPort *SeqToyNode::getInputPort(const std::string& name) const throw(YACS::Exception) +InputPort *SeqToyNode::getInputPort(const std::string& name) const { if(name==NAME_NBOFELTS_INSEQ_INPRT) return (InputPort *)&_inIntValue; @@ -357,7 +357,7 @@ std::list SeqToyNode::getSetOfOutputPort() const return ret; } -OutputPort *SeqToyNode::getOutputPort(const std::string& name) const throw(YACS::Exception) +OutputPort *SeqToyNode::getOutputPort(const std::string& name) const { if(name==NAME_SEQ_OUTPRT) return (OutputPort *)&_seqOut; @@ -420,7 +420,7 @@ std::list Seq2ToyNode::getSetOfInputPort() const return ret; } -InputPort *Seq2ToyNode::getInputPort(const std::string& name) const throw(YACS::Exception) +InputPort *Seq2ToyNode::getInputPort(const std::string& name) const { if(name==NAME_SEQ_INPRT1) return (InputPort *)&_inValue1; @@ -442,7 +442,7 @@ std::list Seq2ToyNode::getSetOfOutputPort() const return ret; } -OutputPort *Seq2ToyNode::getOutputPort(const std::string& name) const throw(YACS::Exception) +OutputPort *Seq2ToyNode::getOutputPort(const std::string& name) const { if(name==NAME_SEQ_OUTPRT) return (OutputPort *)&_seqOut; @@ -520,7 +520,7 @@ std::list Seq3ToyNode::getSetOfInputPort() const return ret; } -InputPort *Seq3ToyNode::getInputPort(const std::string& name) const throw(YACS::Exception) +InputPort *Seq3ToyNode::getInputPort(const std::string& name) const { if(name==NAME_SEQ_INPRT1) return (InputPort *)&_inValue1; @@ -542,7 +542,7 @@ std::list Seq3ToyNode::getSetOfOutputPort() const return ret; } -OutputPort *Seq3ToyNode::getOutputPort(const std::string& name) const throw(YACS::Exception) +OutputPort *Seq3ToyNode::getOutputPort(const std::string& name) const { if(name==NAME_SEQ_OUTPRT) return (OutputPort *)&_seqOut; @@ -572,7 +572,7 @@ InputLimitPort::InputLimitPort(const string& name, Node *node) { } -void InputLimitPort::put(const void *data) throw(ConversionException) +void InputLimitPort::put(const void *data) { put((Any *)data); } @@ -587,7 +587,7 @@ bool InputLimitPort::edIsManuallyInitialized() const return _initData!=0; } -void *InputLimitPort::get() const throw(YACS::Exception) +void *InputLimitPort::get() const { if(!_data) { @@ -653,7 +653,7 @@ OutputLimitPort::OutputLimitPort(const string& name, Node *node, TypeCode *type) { } -void OutputLimitPort::put(const void *data) throw(ConversionException) +void OutputLimitPort::put(const void *data) { put((Any *)data); OutputPort::put(data); @@ -717,7 +717,7 @@ std::list LimitNode::getSetOfOutputPort() const return ret; } -InputPort *LimitNode::getInputPort(const std::string& name) const throw(YACS::Exception) +InputPort *LimitNode::getInputPort(const std::string& name) const { if(name==NAME_FOR_SWPORT) return (InputPort *)&_entry; @@ -725,7 +725,7 @@ InputPort *LimitNode::getInputPort(const std::string& name) const throw(YACS::Ex return ElementaryNode::getInputPort(name); } -OutputPort *LimitNode::getOutputPort(const std::string& name) const throw(YACS::Exception) +OutputPort *LimitNode::getOutputPort(const std::string& name) const { if(name==NAME_FOR_SWPORT) return (OutputPort *)&_switchPort; diff --git a/src/engine/Test/ToyNode.hxx b/src/engine/Test/ToyNode.hxx index 4c4632954..44713e053 100644 --- a/src/engine/Test/ToyNode.hxx +++ b/src/engine/Test/ToyNode.hxx @@ -36,10 +36,10 @@ namespace YACS InputToyPort(const InputToyPort& other, Node *newHelder); InputToyPort(const std::string& name, Node *node); void releaseData() override; - void put(const void *data) throw(ConversionException); + void put(const void *data); InputPort *clone(Node *newHelder) const; bool edIsManuallyInitialized() const; - void *get() const throw(Exception); + void *get() const ; void edRemoveManInit(); void put(Any *data); ~InputToyPort(); @@ -56,7 +56,7 @@ namespace YACS public: OutputToyPort(const std::string& name, Node *node, TypeCode *type); OutputToyPort(const OutputToyPort& other, Node *newHelder); - void put(const void *data) throw(ConversionException); + void put(const void *data); OutputPort *clone(Node *newHelder) const; void put(Any *data); ~OutputToyPort(); @@ -77,7 +77,7 @@ namespace YACS OutputPort *edGetNbOfInputsOutputPort() { return &_nbOfInputsPort; } std::list getSetOfOutputPort() const; int getNumberOfOutputPorts()const; - OutputPort *getOutputPort(const std::string& name) const throw(Exception); + OutputPort *getOutputPort(const std::string& name) const ; protected: Node *simpleClone(ComposedNode *father, bool editionOnly) const; public: @@ -126,10 +126,10 @@ namespace YACS InputPort *edGetInIntValue() const { return (InputPort *)&_inIntValue; } int getNumberOfInputPorts() const; std::list getSetOfInputPort() const; - InputPort *getInputPort(const std::string& name) const throw(Exception); + InputPort *getInputPort(const std::string& name) const ; int getNumberOfOutputPorts() const; std::list getSetOfOutputPort() const; - OutputPort *getOutputPort(const std::string& name) const throw(Exception); + OutputPort *getOutputPort(const std::string& name) const ; protected: Node *simpleClone(ComposedNode *father, bool editionOnly) const; public: @@ -152,10 +152,10 @@ namespace YACS InputPort *edGetInValue2() const { return (InputPort *)&_inValue2; } int getNumberOfInputPorts() const; std::list getSetOfInputPort() const; - InputPort *getInputPort(const std::string& name) const throw(Exception); + InputPort *getInputPort(const std::string& name) const ; int getNumberOfOutputPorts() const; std::list getSetOfOutputPort() const; - OutputPort *getOutputPort(const std::string& name) const throw(Exception); + OutputPort *getOutputPort(const std::string& name) const ; protected: Node *simpleClone(ComposedNode *father, bool editionOnly) const; public: @@ -179,10 +179,10 @@ namespace YACS InputPort *edGetInValue2() const { return (InputPort *)&_inValue2; } int getNumberOfInputPorts() const; std::list getSetOfInputPort() const; - InputPort *getInputPort(const std::string& name) const throw(Exception); + InputPort *getInputPort(const std::string& name) const ; int getNumberOfOutputPorts() const; std::list getSetOfOutputPort() const; - OutputPort *getOutputPort(const std::string& name) const throw(Exception); + OutputPort *getOutputPort(const std::string& name) const ; protected: Node *simpleClone(ComposedNode *father, bool editionOnly) const; public: @@ -197,10 +197,10 @@ namespace YACS { friend class LimitNode; public: - void put(const void *data) throw(ConversionException); + void put(const void *data); InputPort *clone(Node *newHelder) const; bool edIsManuallyInitialized() const; - void *get() const throw(Exception); + void *get() const ; void edRemoveManInit(); void releaseData() override; void put(Any *data); @@ -220,7 +220,7 @@ namespace YACS { friend class LimitNode; public: - void put(const void *data) throw(ConversionException); + void put(const void *data); OutputPort *clone(Node *newHelder) const; void put(Any *data); ~OutputLimitPort(); @@ -249,8 +249,8 @@ namespace YACS OutputPort *getCounterPort() { return &_counterPort; } std::list getSetOfInputPort() const; std::list getSetOfOutputPort() const; - InputPort *getInputPort(const std::string& name) const throw(Exception); - OutputPort *getOutputPort(const std::string& name) const throw(Exception); + InputPort *getInputPort(const std::string& name) const ; + OutputPort *getOutputPort(const std::string& name) const ; LimitNode(const LimitNode& other, ComposedNode *father); LimitNode(const std::string& name); protected: diff --git a/src/engine/TypeCode.cxx b/src/engine/TypeCode.cxx index 670115aeb..1d8c198e6 100644 --- a/src/engine/TypeCode.cxx +++ b/src/engine/TypeCode.cxx @@ -69,7 +69,7 @@ AnyPtr TypeCode::getOrBuildAnyFromZippedData(char *data) const return AtomAny::getOrBuildFromData(data,this); } -const char * TypeCode::name() const throw(YACS::Exception) +const char * TypeCode::name() const { return id(); } @@ -79,7 +79,7 @@ const char * TypeCode::shortName() const return id(); } -const char * TypeCode::id() const throw(YACS::Exception) +const char * TypeCode::id() const { switch(_kind) { @@ -96,7 +96,7 @@ const char * TypeCode::id() const throw(YACS::Exception) } } -int TypeCode::isA(const char* id) const throw(YACS::Exception) +int TypeCode::isA(const char* id) const { throw Exception("Not implemented for this type"); } @@ -171,7 +171,7 @@ unsigned TypeCode::getSizeInByteOfAnyReprInSeq() const } } -const TypeCode * TypeCode::contentType() const throw(YACS::Exception) +const TypeCode * TypeCode::contentType() const { throw Exception("No content type"); }; @@ -324,12 +324,12 @@ AnyPtr TypeCodeObjref::getOrBuildAnyFromZippedData(char *data) const return AtomAny::getOrBuildFromData(data,this); } -const char * TypeCodeObjref::id() const throw(YACS::Exception) +const char * TypeCodeObjref::id() const { return _repoId.c_str(); }; -const char * TypeCodeObjref::name() const throw(YACS::Exception) +const char * TypeCodeObjref::name() const { return _name.c_str(); } @@ -354,7 +354,7 @@ TypeCodeObjref::TypeCodeObjref(const char* repositoryId, * \param id : a given id * \return 1 if true, 0 if false */ -int TypeCodeObjref::isA(const char* id) const throw(YACS::Exception) +int TypeCodeObjref::isA(const char* id) const { if(_repoId == id)return 1; list::const_iterator iter; @@ -453,12 +453,12 @@ AnyPtr TypeCodeSeq::getOrBuildAnyFromZippedData(char *data) const return SequenceAny::getOrBuildFromData(data,this); } -const char * TypeCodeSeq::id() const throw(YACS::Exception) +const char * TypeCodeSeq::id() const { return _repoId.c_str(); } -const char * TypeCodeSeq::name() const throw(YACS::Exception) +const char * TypeCodeSeq::name() const { return _name.c_str(); } @@ -473,7 +473,7 @@ std::string TypeCodeSeq::getPrintStr() const return oss.str(); } -const TypeCode * TypeCodeSeq::contentType() const throw(YACS::Exception) +const TypeCode * TypeCodeSeq::contentType() const { return _content; } @@ -559,12 +559,12 @@ AnyPtr TypeCodeArray::getOrBuildAnyFromZippedData(char *data) const return ArrayAny::getOrBuildFromData(data,this); } -const char * TypeCodeArray::id() const throw(YACS::Exception) +const char * TypeCodeArray::id() const { return _repoId.c_str(); } -const char * TypeCodeArray::name() const throw(YACS::Exception) +const char * TypeCodeArray::name() const { return _name.c_str(); } @@ -578,7 +578,7 @@ unsigned TypeCodeArray::getStaticLgth() const return _staticLgth; } -const TypeCode * TypeCodeArray::contentType() const throw(YACS::Exception) +const TypeCode * TypeCodeArray::contentType() const { return _content; } @@ -678,12 +678,12 @@ AnyPtr TypeCodeStruct::getOrBuildAnyFromZippedData(char *data) const return StructAny::getOrBuildFromData(data,this); } -const char * TypeCodeStruct::id() const throw(YACS::Exception) +const char * TypeCodeStruct::id() const { return _repoId.c_str(); }; -const char * TypeCodeStruct::name() const throw(YACS::Exception) +const char * TypeCodeStruct::name() const { return _name.c_str(); } @@ -701,7 +701,7 @@ unsigned TypeCodeStruct::getSizeInByteOfAnyReprInSeq() const return ret; } -const TypeCode *TypeCodeStruct::contentType() const throw(YACS::Exception) +const TypeCode *TypeCodeStruct::contentType() const { const char what[]="Content type is specified by giving a key."; throw Exception(what); @@ -712,7 +712,7 @@ const TypeCode *TypeCodeStruct::contentType() const throw(YACS::Exception) * \param id : a given id * \return 1 if true, 0 if false */ -int TypeCodeStruct::isA(const char* id) const throw(YACS::Exception) +int TypeCodeStruct::isA(const char* id) const { if(_repoId == id)return 1; return 0; diff --git a/src/engine/TypeCode.hxx b/src/engine/TypeCode.hxx index 5cb2eaa8f..34ec56cab 100644 --- a/src/engine/TypeCode.hxx +++ b/src/engine/TypeCode.hxx @@ -76,11 +76,11 @@ namespace YACS virtual void putReprAtPlace(char *pt, const char *val, bool deepCpy) const; virtual void destroyZippedAny(char *data) const; virtual AnyPtr getOrBuildAnyFromZippedData(char *data) const; - virtual const char * name() const throw(Exception); + virtual const char * name() const; virtual const char * shortName() const; - virtual const char * id() const throw(Exception); - virtual const TypeCode * contentType() const throw(Exception); - virtual int isA(const char* repositoryId) const throw(Exception); + virtual const char * id() const; + virtual const TypeCode * contentType() const; + virtual int isA(const char* repositoryId) const; virtual int isA(const TypeCode* tc) const ; virtual int isAdaptable(const TypeCode* tc) const; virtual int isEquivalent(const TypeCode* tc) const; @@ -134,10 +134,10 @@ namespace YACS void putReprAtPlace(char *pt, const char *val, bool deepCpy) const; void destroyZippedAny(char *data) const; AnyPtr getOrBuildAnyFromZippedData(char *data) const; - const char * id() const throw(Exception); - const char * name() const throw(Exception); + const char * id() const; + const char * name() const; const char * shortName() const; - int isA(const char* repositoryId) const throw(Exception); + int isA(const char* repositoryId) const; virtual int isA(const TypeCode* tc) const ; virtual int isAdaptable(const TypeCode* tc) const; virtual int isEquivalent(const TypeCode* tc) const; @@ -166,12 +166,12 @@ namespace YACS void destroyZippedAny(char *data) const; virtual unsigned getSizeInByteOfAnyReprInSeq() const; AnyPtr getOrBuildAnyFromZippedData(char *data) const; - const char * id() const throw(Exception); - const char * name() const throw(Exception); + const char * id() const; + const char * name() const; const char * shortName() const; virtual std::string getPrintStr() const; - virtual const TypeCode * contentType() const throw(Exception); + virtual const TypeCode * contentType() const; virtual int isA(const TypeCode* tc) const ; virtual int isAdaptable(const TypeCode* tc) const; virtual int isEquivalent(const TypeCode* tc) const; @@ -197,12 +197,12 @@ namespace YACS void putReprAtPlace(char *pt, const char *val, bool deepCpy) const; void destroyZippedAny(char *data) const; AnyPtr getOrBuildAnyFromZippedData(char *data) const; - const char * id() const throw(Exception); - const char * name() const throw(Exception); + const char * id() const; + const char * name() const; const char * shortName() const; unsigned getStaticLgth() const; - virtual const TypeCode * contentType() const throw(Exception); + virtual const TypeCode * contentType() const; virtual int isA(const TypeCode* tc) const ; virtual int isAdaptable(const TypeCode* tc) const; virtual int isEquivalent(const TypeCode* tc) const; @@ -233,12 +233,12 @@ namespace YACS void putReprAtPlace(char *pt, const char *val, bool deepCpy) const; void destroyZippedAny(char *data) const; AnyPtr getOrBuildAnyFromZippedData(char *data) const; - const char * id() const throw(Exception); - const char * name() const throw(Exception); + const char * id() const; + const char * name() const; const char * shortName() const; virtual unsigned getSizeInByteOfAnyReprInSeq() const; - const TypeCode * contentType() const throw(Exception); - virtual int isA(const char* repositoryId) const throw(Exception); + const TypeCode * contentType() const; + virtual int isA(const char* repositoryId) const; virtual int isA(const TypeCode* tc) const ; virtual int isAdaptable(const TypeCode* tc) const; virtual int isEquivalent(const TypeCode* tc) const; diff --git a/src/engine/VisitorSaveSchema.cxx b/src/engine/VisitorSaveSchema.cxx index 85a30463c..6c78af91f 100644 --- a/src/engine/VisitorSaveSchema.cxx +++ b/src/engine/VisitorSaveSchema.cxx @@ -71,7 +71,7 @@ VisitorSaveSchema::~VisitorSaveSchema() } } -void VisitorSaveSchema::openFileSchema(std::string xmlSchema) throw(YACS::Exception) +void VisitorSaveSchema::openFileSchema(std::string xmlSchema) { _out.open(xmlSchema.c_str(), ios::out); if (!_out) diff --git a/src/engine/VisitorSaveSchema.hxx b/src/engine/VisitorSaveSchema.hxx index 8b19a4905..f0e4515ec 100644 --- a/src/engine/VisitorSaveSchema.hxx +++ b/src/engine/VisitorSaveSchema.hxx @@ -61,7 +61,7 @@ namespace YACS public: VisitorSaveSchema(ComposedNode *root); virtual ~VisitorSaveSchema(); - void openFileSchema(std::string xmlDump) throw(Exception); + void openFileSchema(std::string xmlDump) ; void closeFileSchema(); virtual void visitBloc(Bloc *node); virtual void visitElementaryNode(ElementaryNode *node); diff --git a/src/engine/VisitorSaveState.cxx b/src/engine/VisitorSaveState.cxx index 23c840aa5..579ac3800 100644 --- a/src/engine/VisitorSaveState.cxx +++ b/src/engine/VisitorSaveState.cxx @@ -72,7 +72,7 @@ VisitorSaveState::~VisitorSaveState() } } -void VisitorSaveState::openFileDump(const std::string& xmlDump) throw(YACS::Exception) +void VisitorSaveState::openFileDump(const std::string& xmlDump) { _out.open(xmlDump.c_str(), ios::out); if (!_out) diff --git a/src/engine/VisitorSaveState.hxx b/src/engine/VisitorSaveState.hxx index 23decc118..106bd7936 100644 --- a/src/engine/VisitorSaveState.hxx +++ b/src/engine/VisitorSaveState.hxx @@ -37,7 +37,7 @@ namespace YACS public: VisitorSaveState(ComposedNode *root); virtual ~VisitorSaveState(); - void openFileDump(const std::string& xmlDump) throw(Exception); + void openFileDump(const std::string& xmlDump) ; void closeFileDump(); virtual void visitBloc(Bloc *node); virtual void visitElementaryNode(ElementaryNode *node); diff --git a/src/engine/WhileLoop.cxx b/src/engine/WhileLoop.cxx index bb2a5eef1..a057517de 100644 --- a/src/engine/WhileLoop.cxx +++ b/src/engine/WhileLoop.cxx @@ -89,7 +89,7 @@ Node *WhileLoop::simpleClone(ComposedNode *father, bool editionOnly) const return new WhileLoop(*this,father,editionOnly); } -InputPort *WhileLoop::getInputPort(const std::string& name) const throw(YACS::Exception) +InputPort *WhileLoop::getInputPort(const std::string& name) const { if(name==NAME_OF_INPUT_CONDITION) return (InputPort*)&_conditionPort; @@ -122,7 +122,7 @@ YACS::Event WhileLoop::updateStateOnFinishedEventFrom(Node *node) void WhileLoop::checkLinkPossibility(OutPort *start, const std::list& pointsOfViewStart, InPort *end, - const std::list& pointsOfViewEnd) throw(YACS::Exception) + const std::list& pointsOfViewEnd) { DEBTRACE("WhileLoop::checkLinkPossibility"); } diff --git a/src/engine/WhileLoop.hxx b/src/engine/WhileLoop.hxx index 9d86344ab..800de5b11 100644 --- a/src/engine/WhileLoop.hxx +++ b/src/engine/WhileLoop.hxx @@ -46,7 +46,7 @@ namespace YACS void exUpdateState(); void init(bool start=true); InputPort *edGetConditionPort() { return &_conditionPort; } - InputPort* getInputPort(const std::string& name) const throw(Exception); + InputPort* getInputPort(const std::string& name) const ; std::list getLocalInputPorts() const; virtual void accept(Visitor *visitor); InputPort *getDecisionPort() const { return (InputPort *)&_conditionPort; } @@ -54,7 +54,7 @@ namespace YACS protected: Node *simpleClone(ComposedNode *father, bool editionOnly=true) const; void checkLinkPossibility(OutPort *start, const std::list& pointsOfViewStart, - InPort *end, const std::list& pointsOfViewEnd) throw(Exception); + InPort *end, const std::list& pointsOfViewEnd) ; YACS::Event updateStateOnFinishedEventFrom(Node *node); }; } diff --git a/src/runtime/CORBACORBAConv.cxx b/src/runtime/CORBACORBAConv.cxx index bc0da407c..e212d0077 100644 --- a/src/runtime/CORBACORBAConv.cxx +++ b/src/runtime/CORBACORBAConv.cxx @@ -34,7 +34,7 @@ CorbaCorba::CorbaCorba(InputCorbaPort* p) * transition method from const void* to CORBA::Any* * \param data : const void * data */ -void CorbaCorba::put(const void *data) throw(ConversionException) +void CorbaCorba::put(const void *data) { put((CORBA::Any *)data); } @@ -43,7 +43,7 @@ void CorbaCorba::put(const void *data) throw(ConversionException) /*! * \param data : CORBA::Any object */ -void CorbaCorba::put(CORBA::Any *data) throw(ConversionException) +void CorbaCorba::put(CORBA::Any *data) { CORBA::Any *a = convertCorbaCorba(edGetType(),data); _port->put(a); diff --git a/src/runtime/CORBACORBAConv.hxx b/src/runtime/CORBACORBAConv.hxx index 99934458e..b9755e84e 100644 --- a/src/runtime/CORBACORBAConv.hxx +++ b/src/runtime/CORBACORBAConv.hxx @@ -38,8 +38,8 @@ namespace YACS { public: CorbaCorba(InputCorbaPort* p); - virtual void put(const void *data) throw(ConversionException); - void put(CORBA::Any *data) throw(ConversionException); + virtual void put(const void *data); + void put(CORBA::Any *data); }; } diff --git a/src/runtime/CORBACppConv.cxx b/src/runtime/CORBACppConv.cxx index d86e4f711..a80512c2f 100644 --- a/src/runtime/CORBACppConv.cxx +++ b/src/runtime/CORBACppConv.cxx @@ -46,7 +46,7 @@ namespace YACS * \param data : CORBA::Any object as a void * pointer */ - void CorbaCpp::put(const void *data) throw(ConversionException) + void CorbaCpp::put(const void *data) { put((CORBA::Any *)data); } @@ -55,7 +55,7 @@ namespace YACS /*! * \param data : CORBA::Any object */ - void CorbaCpp::put(CORBA::Any *data) throw(ConversionException) + void CorbaCpp::put(CORBA::Any *data) { DEBTRACE("CorbaCpp::put"); YACS::ENGINE::Any *ob; diff --git a/src/runtime/CORBACppConv.hxx b/src/runtime/CORBACppConv.hxx index 68de48695..a008fcd91 100644 --- a/src/runtime/CORBACppConv.hxx +++ b/src/runtime/CORBACppConv.hxx @@ -35,8 +35,8 @@ namespace YACS { public: CorbaCpp(InputPort* p); - virtual void put(const void *data) throw(ConversionException); - void put(CORBA::Any *data) throw(ConversionException); + virtual void put(const void *data); + void put(CORBA::Any *data); }; int isAdaptableCppCorba(const TypeCode *t1,const TypeCode *t2); } diff --git a/src/runtime/CORBANeutralConv.cxx b/src/runtime/CORBANeutralConv.cxx index b0f1cc969..8462bd2b3 100644 --- a/src/runtime/CORBANeutralConv.cxx +++ b/src/runtime/CORBANeutralConv.cxx @@ -38,7 +38,7 @@ CorbaNeutral::CorbaNeutral(InputPort* p) * \param data : CORBA::Any object as a void * pointer */ -void CorbaNeutral::put(const void *data) throw(ConversionException) +void CorbaNeutral::put(const void *data) { put((CORBA::Any *)data); } @@ -47,7 +47,7 @@ void CorbaNeutral::put(const void *data) throw(ConversionException) /*! * \param data : CORBA::Any object */ -void CorbaNeutral::put(CORBA::Any *data) throw(ConversionException) +void CorbaNeutral::put(CORBA::Any *data) { DEBTRACE( "CorbaNeutral::put" ) YACS::ENGINE::Any *ob; diff --git a/src/runtime/CORBANeutralConv.hxx b/src/runtime/CORBANeutralConv.hxx index db0dd4d76..d62e90154 100644 --- a/src/runtime/CORBANeutralConv.hxx +++ b/src/runtime/CORBANeutralConv.hxx @@ -35,8 +35,8 @@ namespace YACS { public: CorbaNeutral(InputPort* p); - virtual void put(const void *data) throw(ConversionException); - void put(CORBA::Any *data) throw(ConversionException); + virtual void put(const void *data); + void put(CORBA::Any *data); }; } } diff --git a/src/runtime/CORBAPorts.cxx b/src/runtime/CORBAPorts.cxx index 6cd9bcbdc..91cec1c07 100644 --- a/src/runtime/CORBAPorts.cxx +++ b/src/runtime/CORBAPorts.cxx @@ -136,7 +136,7 @@ void InputCorbaPort::edRemoveManInit() InputPort::edRemoveManInit(); } -void InputCorbaPort::put(const void *data) throw (ConversionException) +void InputCorbaPort::put(const void *data) { put((CORBA::Any *)data); } @@ -165,7 +165,7 @@ void InputCorbaPort::releaseData() {//do nothing - to be implemented } -void InputCorbaPort::put(CORBA::Any *data) throw (ConversionException) +void InputCorbaPort::put(CORBA::Any *data) { #ifdef REFCNT DEBTRACE("refcount CORBA : " << ((omni::TypeCode_base*)data->pd_tc.in())->pd_ref_count); @@ -193,7 +193,7 @@ InputPort *InputCorbaPort::clone(Node *newHelder) const return new InputCorbaPort(*this,newHelder); } -void *InputCorbaPort::get() const throw(YACS::Exception) +void *InputCorbaPort::get() const { return (void *)&_data; } @@ -313,12 +313,12 @@ OutputCorbaPort::~OutputCorbaPort() #endif } -void OutputCorbaPort::put(const void *data) throw (ConversionException) +void OutputCorbaPort::put(const void *data) { put((CORBA::Any *)data); } -void OutputCorbaPort::put(CORBA::Any *data) throw (ConversionException) +void OutputCorbaPort::put(CORBA::Any *data) { InputPort *p; diff --git a/src/runtime/CORBAPorts.hxx b/src/runtime/CORBAPorts.hxx index ddf297605..12a2021b1 100644 --- a/src/runtime/CORBAPorts.hxx +++ b/src/runtime/CORBAPorts.hxx @@ -49,11 +49,11 @@ namespace YACS virtual ~InputCorbaPort(); bool edIsManuallyInitialized() const; void edRemoveManInit(); - virtual void put(const void *data) throw(ConversionException); - void put(CORBA::Any *data) throw (ConversionException); + virtual void put(const void *data); + void put(CORBA::Any *data); void releaseData() override; InputPort *clone(Node *newHelder) const; - void *get() const throw(Exception); + void *get() const ; virtual bool isEmpty(); virtual CORBA::Any * getAny(); virtual std::string getAsString(); @@ -85,8 +85,8 @@ namespace YACS OutputCorbaPort(const std::string& name, Node *node, TypeCode * type); OutputCorbaPort(const OutputCorbaPort& other, Node *newHelder); virtual ~OutputCorbaPort(); - virtual void put(const void *data) throw(ConversionException); - void put(CORBA::Any *data) throw (ConversionException); + virtual void put(const void *data); + void put(CORBA::Any *data); OutputPort *clone(Node *newHelder) const; virtual CORBA::Any * getAny(); virtual CORBA::Any * getAnyOut(); diff --git a/src/runtime/CORBAPythonConv.cxx b/src/runtime/CORBAPythonConv.cxx index e90cef6c3..695c044a5 100644 --- a/src/runtime/CORBAPythonConv.cxx +++ b/src/runtime/CORBAPythonConv.cxx @@ -34,7 +34,7 @@ CorbaPyDouble::CorbaPyDouble(InputPyPort* p) : ProxyPort(p), DataPort(p->getName(), p->getNode(), p->edGetType()), Port(p->getNode()) {} -void CorbaPyDouble::put(const void *data) throw(ConversionException) +void CorbaPyDouble::put(const void *data) { put((CORBA::Any *)data); } @@ -43,7 +43,7 @@ void CorbaPyDouble::put(const void *data) throw(ConversionException) /*! * \param data : CORBA::Any object */ -void CorbaPyDouble::put(CORBA::Any *data) throw(ConversionException) +void CorbaPyDouble::put(CORBA::Any *data) { InterpreterUnlocker loc; PyObject* ob=convertCorbaPyObject(edGetType(),data); @@ -57,7 +57,7 @@ CorbaPyInt::CorbaPyInt(InputPyPort* p) : ProxyPort(p), DataPort(p->getName(), p->getNode(), p->edGetType()), Port(p->getNode()) {} -void CorbaPyInt::put(const void *data) throw(ConversionException) +void CorbaPyInt::put(const void *data) { put((CORBA::Any *)data); } @@ -66,7 +66,7 @@ void CorbaPyInt::put(const void *data) throw(ConversionException) /*! * \param data : CORBA::Any object */ -void CorbaPyInt::put(CORBA::Any *data) throw(ConversionException) +void CorbaPyInt::put(CORBA::Any *data) { InterpreterUnlocker loc; PyObject* ob=convertCorbaPyObject(edGetType(),data); @@ -78,7 +78,7 @@ void CorbaPyInt::put(CORBA::Any *data) throw(ConversionException) CorbaPyString::CorbaPyString(InputPyPort* p) : ProxyPort(p), DataPort(p->getName(), p->getNode(), p->edGetType()), Port(p->getNode()) {} -void CorbaPyString::put(const void *data) throw(ConversionException) +void CorbaPyString::put(const void *data) { put((CORBA::Any *)data); } @@ -87,7 +87,7 @@ void CorbaPyString::put(const void *data) throw(ConversionException) /*! * \param data : CORBA::Any object */ -void CorbaPyString::put(CORBA::Any *data) throw(ConversionException) +void CorbaPyString::put(CORBA::Any *data) { InterpreterUnlocker loc; PyObject* ob=convertCorbaPyObject(edGetType(),data); @@ -103,7 +103,7 @@ CorbaPyBool::CorbaPyBool(InputPyPort* p) /*!Convert a CORBA::Any boolean to a PyObject boolean * It's only a wrapper around put(CORBA::Any *data) */ -void CorbaPyBool::put(const void *data) throw(ConversionException) +void CorbaPyBool::put(const void *data) { put((CORBA::Any *)data); } @@ -112,7 +112,7 @@ void CorbaPyBool::put(const void *data) throw(ConversionException) /*! * \param data : CORBA::Any object */ -void CorbaPyBool::put(CORBA::Any *data) throw(ConversionException) +void CorbaPyBool::put(CORBA::Any *data) { InterpreterUnlocker loc; PyObject* ob=convertCorbaPyObject(edGetType(),data); @@ -125,7 +125,7 @@ CorbaPyObjref::CorbaPyObjref(InputPyPort* p) : ProxyPort(p), DataPort(p->getName(), p->getNode(), p->edGetType()), Port(p->getNode()) {} -void CorbaPyObjref::put(const void *data) throw(ConversionException) +void CorbaPyObjref::put(const void *data) { put((CORBA::Any *)data); } @@ -134,7 +134,7 @@ void CorbaPyObjref::put(const void *data) throw(ConversionException) /*! * \param data : CORBA::Any object */ -void CorbaPyObjref::put(CORBA::Any *data) throw(ConversionException) +void CorbaPyObjref::put(CORBA::Any *data) { InterpreterUnlocker loc; PyObject* ob=convertCorbaPyObject(edGetType(),data); @@ -153,7 +153,7 @@ CorbaPySequence::CorbaPySequence(InputPyPort* p) _dynfactory = getSALOMERuntime()->getDynFactory(); } -void CorbaPySequence::put(const void *data) throw(ConversionException) +void CorbaPySequence::put(const void *data) { put((CORBA::Any *)data); } @@ -162,7 +162,7 @@ void CorbaPySequence::put(const void *data) throw(ConversionException) /*! * \param data : CORBA::Any object */ -void CorbaPySequence::put(CORBA::Any *data) throw(ConversionException) +void CorbaPySequence::put(CORBA::Any *data) { InterpreterUnlocker loc; PyObject* ob=convertCorbaPyObject(edGetType(),data); @@ -180,7 +180,7 @@ CorbaPyStruct::CorbaPyStruct(InputPyPort* p) { } -void CorbaPyStruct::put(const void *data) throw(ConversionException) +void CorbaPyStruct::put(const void *data) { put((CORBA::Any *)data); } @@ -189,7 +189,7 @@ void CorbaPyStruct::put(const void *data) throw(ConversionException) /*! * \param data : CORBA::Any object */ -void CorbaPyStruct::put(CORBA::Any *data) throw(ConversionException) +void CorbaPyStruct::put(CORBA::Any *data) { InterpreterUnlocker loc; PyObject* ob=convertCorbaPyObject(edGetType(),data); diff --git a/src/runtime/CORBAPythonConv.hxx b/src/runtime/CORBAPythonConv.hxx index 5fb9d4c0d..7c15d0440 100644 --- a/src/runtime/CORBAPythonConv.hxx +++ b/src/runtime/CORBAPythonConv.hxx @@ -39,8 +39,8 @@ namespace YACS { public: CorbaPyDouble(InputPyPort* p); - virtual void put(const void *data) throw(ConversionException); - void put(CORBA::Any *data) throw(ConversionException); + virtual void put(const void *data); + void put(CORBA::Any *data); }; /*! \brief Class for conversion from CORBA Output port to Python Input port @@ -52,8 +52,8 @@ namespace YACS { public: CorbaPyInt(InputPyPort* p); - virtual void put(const void *data) throw(ConversionException); - void put(CORBA::Any *data) throw(ConversionException); + virtual void put(const void *data); + void put(CORBA::Any *data); }; /*! \brief Class for conversion from CORBA Output port to Python Input port @@ -65,8 +65,8 @@ namespace YACS { public: CorbaPyString(InputPyPort* p); - virtual void put(const void *data) throw(ConversionException); - void put(CORBA::Any *data) throw(ConversionException); + virtual void put(const void *data); + void put(CORBA::Any *data); }; /*! \brief Class for conversion from CORBA Output port to Python Input port @@ -80,8 +80,8 @@ namespace YACS { public: CorbaPyBool(InputPyPort* p); - virtual void put(const void *data) throw(ConversionException); - void put(CORBA::Any *data) throw(ConversionException); + virtual void put(const void *data); + void put(CORBA::Any *data); }; /*! \brief Class for conversion from CORBA Output port to Python Input port @@ -93,8 +93,8 @@ namespace YACS { public: CorbaPyObjref(InputPyPort* p); - virtual void put(const void *data) throw(ConversionException); - void put(CORBA::Any *data) throw(ConversionException); + virtual void put(const void *data); + void put(CORBA::Any *data); }; /*! \brief Class for conversion from CORBA Output port to Python Input port @@ -106,8 +106,8 @@ namespace YACS { public: CorbaPySequence(InputPyPort* p); - virtual void put(const void *data) throw(ConversionException); - void put(CORBA::Any *data) throw(ConversionException); + virtual void put(const void *data); + void put(CORBA::Any *data); protected: DynamicAny::DynAnyFactory_ptr _dynfactory; }; @@ -121,8 +121,8 @@ namespace YACS { public: CorbaPyStruct(InputPyPort* p); - virtual void put(const void *data) throw(ConversionException); - void put(CORBA::Any *data) throw(ConversionException); + virtual void put(const void *data); + void put(CORBA::Any *data); }; } diff --git a/src/runtime/CORBAXMLConv.cxx b/src/runtime/CORBAXMLConv.cxx index e8cf36cef..cb6bf5130 100644 --- a/src/runtime/CORBAXMLConv.cxx +++ b/src/runtime/CORBAXMLConv.cxx @@ -38,7 +38,7 @@ CorbaXml::CorbaXml(InputXmlPort* p) * \param data : CORBA::Any object as a void * pointer */ -void CorbaXml::put(const void *data) throw(ConversionException) +void CorbaXml::put(const void *data) { put((CORBA::Any *)data); } @@ -47,7 +47,7 @@ void CorbaXml::put(const void *data) throw(ConversionException) /*! * \param data : CORBA::Any object */ -void CorbaXml::put(CORBA::Any *data) throw(ConversionException) +void CorbaXml::put(CORBA::Any *data) { DEBTRACE("CorbaXml::put" ); std::string sss = convertCorbaXml(edGetType(),data); diff --git a/src/runtime/CORBAXMLConv.hxx b/src/runtime/CORBAXMLConv.hxx index a0fd94efb..629dd5849 100644 --- a/src/runtime/CORBAXMLConv.hxx +++ b/src/runtime/CORBAXMLConv.hxx @@ -34,8 +34,8 @@ namespace YACS { public: CorbaXml(InputXmlPort* p); - virtual void put(const void *data) throw(ConversionException); - void put(CORBA::Any *data) throw(ConversionException); + virtual void put(const void *data); + void put(CORBA::Any *data); }; } } diff --git a/src/runtime/CalStreamPort.cxx b/src/runtime/CalStreamPort.cxx index e780cf0a9..4cb598e13 100644 --- a/src/runtime/CalStreamPort.cxx +++ b/src/runtime/CalStreamPort.cxx @@ -278,7 +278,7 @@ OutputCalStreamPort *OutputCalStreamPort::clone(Node *newHelder) const return new OutputCalStreamPort(*this,newHelder); } -bool OutputCalStreamPort::addInPort(InPort *inPort) throw(YACS::Exception) +bool OutputCalStreamPort::addInPort(InPort *inPort) { DEBTRACE("OutputCalStreamPort::addInPort " << InputCalStreamPort::NAME ); if(inPort->getNameOfTypeOfCurrentInstance()!=InputCalStreamPort::NAME) @@ -300,7 +300,7 @@ bool OutputCalStreamPort::addInPort(InPort *inPort) throw(YACS::Exception) } -int OutputCalStreamPort::removeInPort(InPort *inPort, bool forward) throw(YACS::Exception) +int OutputCalStreamPort::removeInPort(InPort *inPort, bool forward) { DEBTRACE("OutputCalStreamPort::removeInPort"); if(inPort->getNameOfTypeOfCurrentInstance()!=InputCalStreamPort::NAME && !forward) diff --git a/src/runtime/CalStreamPort.hxx b/src/runtime/CalStreamPort.hxx index e6d93356f..ae405362d 100644 --- a/src/runtime/CalStreamPort.hxx +++ b/src/runtime/CalStreamPort.hxx @@ -93,10 +93,10 @@ namespace YACS void setSchema(const std::string& schema); std::string getSchema(){return _schema;}; void setProperty(const std::string& name, const std::string& value); - virtual bool addInPort(InPort *inPort) throw(Exception); + virtual bool addInPort(InPort *inPort) ; std::string getNameOfTypeOfCurrentInstance() const; OutputCalStreamPort * clone(Node *newHelder) const; - virtual int removeInPort(InPort *inPort, bool forward) throw(Exception); + virtual int removeInPort(InPort *inPort, bool forward) ; protected: std::string _depend; std::string _schema; diff --git a/src/runtime/CppCORBAConv.cxx b/src/runtime/CppCORBAConv.cxx index a5800bf1e..2314183f6 100644 --- a/src/runtime/CppCORBAConv.cxx +++ b/src/runtime/CppCORBAConv.cxx @@ -35,7 +35,7 @@ namespace YACS return convertNeutralCorba(t, data); } - void CppCorba::put(const void *data) throw(ConversionException) + void CppCorba::put(const void *data) { put((Any *)data); } @@ -45,7 +45,7 @@ namespace YACS * \param data : python object */ - void CppCorba::put(Any *data) throw(ConversionException) + void CppCorba::put(Any *data) { CORBA::Any* a = convertCppCorba(edGetType(), data); _port->put(a); diff --git a/src/runtime/CppCORBAConv.hxx b/src/runtime/CppCORBAConv.hxx index fc6c2c7c9..adb454eee 100644 --- a/src/runtime/CppCORBAConv.hxx +++ b/src/runtime/CppCORBAConv.hxx @@ -34,8 +34,8 @@ namespace YACS public: CppCorba(InputCorbaPort* p) : ProxyPort(p), DataPort(p->getName(), p->getNode(), p->edGetType()), Port(p->getNode()) {} - virtual void put(const void *data) throw(ConversionException); - void put(Any *data) throw(ConversionException); + virtual void put(const void *data); + void put(Any *data); }; int isAdaptableCorbaCpp(const TypeCode *t1, const TypeCode *t2); } diff --git a/src/runtime/CppComponent.cxx b/src/runtime/CppComponent.cxx index 471e839c1..ff1b26a55 100644 --- a/src/runtime/CppComponent.cxx +++ b/src/runtime/CppComponent.cxx @@ -113,7 +113,7 @@ CppComponent::~CppComponent() } void CppComponent::run (const char * service, int nbIn, int nbOut, - Any ** argIn, Any ** argOut) throw (YACS::Exception) + Any ** argIn, Any ** argOut) { int i; returnInfo return_code; diff --git a/src/runtime/CppComponent.hxx b/src/runtime/CppComponent.hxx index 0e32b00ca..7fa6a745e 100644 --- a/src/runtime/CppComponent.hxx +++ b/src/runtime/CppComponent.hxx @@ -52,7 +52,7 @@ namespace YACS virtual ~CppComponent(); void run(const char * service, int nbIn, int nbOut, - Any ** argIn, Any ** argOut) throw (YACS::Exception); + Any ** argIn, Any ** argOut); static const char KIND[]; virtual std::string getKind() const; diff --git a/src/runtime/CppContainer.cxx b/src/runtime/CppContainer.cxx index 4b32ba08c..64f1c0477 100644 --- a/src/runtime/CppContainer.cxx +++ b/src/runtime/CppContainer.cxx @@ -85,7 +85,7 @@ bool CppContainer::isAlreadyStarted(const Task *askingNode) const return NULL != _trueCont; } -void CppContainer::start(const Task *askingNode) throw (YACS::Exception) +void CppContainer::start(const Task *askingNode) { _trueCont = LocalContainer::get(); } @@ -111,7 +111,7 @@ Container *CppContainer::cloneAlways() const return new CppContainer(*this); } -bool CppContainer::loadComponentLibrary(const std::string & componentName) throw (YACS::Exception) +bool CppContainer::loadComponentLibrary(const std::string & componentName) { if (_trueCont) { @@ -168,7 +168,7 @@ std::string CppContainer::getFullPlacementId(const Task *askingNode) const return "/"; } -void CppContainer::checkCapabilityToDealWith(const ComponentInstance *inst) const throw(YACS::Exception) +void CppContainer::checkCapabilityToDealWith(const ComponentInstance *inst) const { if(inst->getKind()!=CppComponent::KIND) throw Exception("CppContainer::checkCapabilityToDealWith : CppContainer is not able to deal with this type of ComponentInstance."); diff --git a/src/runtime/CppContainer.hxx b/src/runtime/CppContainer.hxx index 52b81860c..8027678cc 100644 --- a/src/runtime/CppContainer.hxx +++ b/src/runtime/CppContainer.hxx @@ -109,7 +109,7 @@ namespace YACS virtual ~CppContainer(); std::string getKind() const; bool isAlreadyStarted(const Task *askingNode) const; - void start(const Task *askingNode) throw (YACS::Exception); + void start(const Task *askingNode); void shutdown(int level); std::string getPlacementId(const Task *askingNode) const; std::string getFullPlacementId(const Task *askingNode) const; @@ -118,8 +118,8 @@ namespace YACS void lock(); void unLock(); - void checkCapabilityToDealWith(const ComponentInstance *inst) const throw (YACS::Exception); - bool loadComponentLibrary(const std::string & componentName) throw (YACS::Exception); + void checkCapabilityToDealWith(const ComponentInstance *inst) const; + bool loadComponentLibrary(const std::string & componentName); CppComponent * createComponentInstance(const std::string & componentName); void createInternalInstance(const std::string & componentName, void *& obj, RunFunction &r, TerminateFunction &t); diff --git a/src/runtime/CppCppConv.cxx b/src/runtime/CppCppConv.cxx index eeecbee53..6b1bcab25 100644 --- a/src/runtime/CppCppConv.cxx +++ b/src/runtime/CppCppConv.cxx @@ -47,7 +47,7 @@ namespace YACS * transition method from const void* to Any* * \param data : const void * data */ - void CppCpp::put(const void *data) throw(ConversionException) + void CppCpp::put(const void *data) { put((Any *)data); } @@ -56,7 +56,7 @@ namespace YACS /*! * \param data : Any object */ - void CppCpp::put(Any *data) throw(ConversionException) + void CppCpp::put(Any *data) { Any *a = convertCppCpp(edGetType(),data); DEBTRACE( "before put refcnt: " << a->getRefCnt() ); diff --git a/src/runtime/CppCppConv.hxx b/src/runtime/CppCppConv.hxx index f3628b5dc..b39e6efa0 100644 --- a/src/runtime/CppCppConv.hxx +++ b/src/runtime/CppCppConv.hxx @@ -37,8 +37,8 @@ namespace YACS { public: CppCpp(InputCppPort* p); - virtual void put(const void *data) throw(ConversionException); - void put(Any *data) throw(ConversionException); + virtual void put(const void *data); + void put(Any *data); }; } diff --git a/src/runtime/CppNeutralConv.cxx b/src/runtime/CppNeutralConv.cxx index 4fc9a91aa..45b381c67 100644 --- a/src/runtime/CppNeutralConv.cxx +++ b/src/runtime/CppNeutralConv.cxx @@ -43,7 +43,7 @@ namespace YACS { } - void CppNeutral::put(const void *data) throw(ConversionException) + void CppNeutral::put(const void *data) { DEBTRACE(" CppNeutral::put(const void *data)"); put((Any *)data); @@ -54,7 +54,7 @@ namespace YACS * \param data : Neutral (Any *) value */ - void CppNeutral::put(Any *data) throw(ConversionException) + void CppNeutral::put(Any *data) { DEBTRACE("CppNeutral::put " << data); Any *ob; diff --git a/src/runtime/CppNeutralConv.hxx b/src/runtime/CppNeutralConv.hxx index 87efd951d..d682cbf76 100644 --- a/src/runtime/CppNeutralConv.hxx +++ b/src/runtime/CppNeutralConv.hxx @@ -32,8 +32,8 @@ namespace YACS { public: CppNeutral(InputPort* p); - virtual void put(const void *data) throw(ConversionException); - void put(Any *data) throw(ConversionException); + virtual void put(const void *data) ; + void put(Any *data); }; int isAdaptableNeutralCpp(const TypeCode * t1, const TypeCode * t2); } diff --git a/src/runtime/CppPorts.cxx b/src/runtime/CppPorts.cxx index a46f86765..37cce37dd 100644 --- a/src/runtime/CppPorts.cxx +++ b/src/runtime/CppPorts.cxx @@ -62,7 +62,7 @@ void InputCppPort::edRemoveManInit() InputPort::edRemoveManInit(); } -void InputCppPort::put(const void *data) throw(ConversionException) +void InputCppPort::put(const void *data) { put((YACS::ENGINE::Any *)data); } @@ -74,7 +74,7 @@ void InputCppPort::releaseData() _data=nullptr; } -void InputCppPort::put(YACS::ENGINE::Any *data) throw(ConversionException) +void InputCppPort::put(YACS::ENGINE::Any *data) { releaseData(); _data=data; @@ -92,7 +92,7 @@ YACS::ENGINE::Any * InputCppPort::getCppObj() const return _data; } -void *InputCppPort::get() const throw(YACS::Exception) +void *InputCppPort::get() const { return (void*) _data; } @@ -166,12 +166,12 @@ OutputCppPort::OutputCppPort(const OutputCppPort& other, Node *newHelder):Output { } -void OutputCppPort::put(const void *data) throw(ConversionException) +void OutputCppPort::put(const void *data) { put((YACS::ENGINE::Any *)data); } -void OutputCppPort::put(YACS::ENGINE::Any *data) throw(ConversionException) +void OutputCppPort::put(YACS::ENGINE::Any *data) { InputPort *p; if(_data) diff --git a/src/runtime/CppPorts.hxx b/src/runtime/CppPorts.hxx index 28fb44e6d..2798eb415 100644 --- a/src/runtime/CppPorts.hxx +++ b/src/runtime/CppPorts.hxx @@ -44,12 +44,12 @@ namespace YACS ~InputCppPort(); bool edIsManuallyInitialized() const; void edRemoveManInit(); - virtual void put(const void *data) throw(ConversionException); - void put(YACS::ENGINE::Any *data) throw(ConversionException); + virtual void put(const void *data); + void put(YACS::ENGINE::Any *data); void releaseData() override; InputPort *clone(Node *newHelder) const; virtual YACS::ENGINE::Any * getCppObj() const; - void *get() const throw(Exception); + void *get() const ; virtual bool isEmpty(); virtual void exSaveInit(); virtual void exRestoreInit(); @@ -65,8 +65,8 @@ namespace YACS OutputCppPort(const std::string& name, Node * node, TypeCode * type); OutputCppPort(const OutputCppPort& other, Node *newHelder); ~OutputCppPort(); - virtual void put(const void *data) throw(ConversionException); - void put(YACS::ENGINE::Any *data) throw(ConversionException); + virtual void put(const void *data); + void put(YACS::ENGINE::Any *data); OutputPort *clone(Node *newHelder) const; virtual YACS::ENGINE::Any * get() const; virtual std::string dump(); diff --git a/src/runtime/CppPythonConv.cxx b/src/runtime/CppPythonConv.cxx index 7876b022c..791e739b9 100644 --- a/src/runtime/CppPythonConv.cxx +++ b/src/runtime/CppPythonConv.cxx @@ -46,12 +46,12 @@ namespace YACS /*! * \param data : C++ value received */ - void CppPy::put(const void *data) throw(ConversionException) + void CppPy::put(const void *data) { put((Any *) data); } - void CppPy::put(Any *data) throw(ConversionException) + void CppPy::put(Any *data) { DEBTRACE(" CppPython::put(Any *data)"); PyObject *ob; diff --git a/src/runtime/CppPythonConv.hxx b/src/runtime/CppPythonConv.hxx index e5807228a..d35a6d384 100644 --- a/src/runtime/CppPythonConv.hxx +++ b/src/runtime/CppPythonConv.hxx @@ -32,8 +32,8 @@ namespace YACS { public: CppPy(InputPyPort* p); - virtual void put(const void *data) throw(ConversionException); - virtual void put(Any *a) throw(ConversionException); + virtual void put(const void *data) ; + virtual void put(Any *a) ; }; int isAdaptablePyObjectCpp(const TypeCode *t1, const TypeCode *t2); } diff --git a/src/runtime/CppXMLConv.cxx b/src/runtime/CppXMLConv.cxx index 61c5ae0fb..9cedfba2a 100644 --- a/src/runtime/CppXMLConv.cxx +++ b/src/runtime/CppXMLConv.cxx @@ -47,7 +47,7 @@ namespace YACS * \param data : YACS::ENGINE::Any object as a void * pointer */ - void CppXml::put(const void *data) throw(ConversionException) + void CppXml::put(const void *data) { put((YACS::ENGINE::Any *)data); } @@ -56,7 +56,7 @@ namespace YACS /*! * \param data : YACS::ENGINE::Any object */ - void CppXml::put(YACS::ENGINE::Any *data) throw(ConversionException) + void CppXml::put(YACS::ENGINE::Any *data) { DEBTRACE("CppXml::put"); std::string s = convertCppXml(edGetType(), data); diff --git a/src/runtime/CppXMLConv.hxx b/src/runtime/CppXMLConv.hxx index 57bdc5197..9622186a8 100644 --- a/src/runtime/CppXMLConv.hxx +++ b/src/runtime/CppXMLConv.hxx @@ -32,8 +32,8 @@ namespace YACS { public: CppXml(InputXmlPort* p); - virtual void put(const void *data) throw(ConversionException); - void put(YACS::ENGINE::Any *data) throw(ConversionException); + virtual void put(const void *data); + void put(YACS::ENGINE::Any *data); }; int isAdaptableXmlCpp(const TypeCode *t1, const TypeCode *t2); } diff --git a/src/runtime/NeutralCORBAConv.cxx b/src/runtime/NeutralCORBAConv.cxx index 11a2d927f..d9f6961d1 100644 --- a/src/runtime/NeutralCORBAConv.cxx +++ b/src/runtime/NeutralCORBAConv.cxx @@ -27,7 +27,7 @@ using namespace YACS::ENGINE; using namespace std; -void NeutralCorbaInt::put(const void *data) throw(ConversionException) +void NeutralCorbaInt::put(const void *data) { put((YACS::ENGINE::Any *)data); } @@ -37,7 +37,7 @@ void NeutralCorbaInt::put(const void *data) throw(ConversionException) * \param data : YACS::ENGINE::Any object */ -void NeutralCorbaInt::put(YACS::ENGINE::Any *data) throw(ConversionException) +void NeutralCorbaInt::put(YACS::ENGINE::Any *data) { CORBA::Any *a =convertNeutralCorba(edGetType(),data); _port->put(a); @@ -45,7 +45,7 @@ void NeutralCorbaInt::put(YACS::ENGINE::Any *data) throw(ConversionException) delete a; } -void NeutralCorbaBool::put(const void *data) throw(ConversionException) +void NeutralCorbaBool::put(const void *data) { put((YACS::ENGINE::Any *)data); } @@ -55,7 +55,7 @@ void NeutralCorbaBool::put(const void *data) throw(ConversionException) * \param data : YACS::ENGINE::Any object */ -void NeutralCorbaBool::put(YACS::ENGINE::Any *data) throw(ConversionException) +void NeutralCorbaBool::put(YACS::ENGINE::Any *data) { CORBA::Any *a =convertNeutralCorba(edGetType(),data); _port->put(a); @@ -64,7 +64,7 @@ void NeutralCorbaBool::put(YACS::ENGINE::Any *data) throw(ConversionException) } -void NeutralCorbaDouble::put(const void *data) throw(ConversionException) +void NeutralCorbaDouble::put(const void *data) { put((YACS::ENGINE::Any *)data); } @@ -74,7 +74,7 @@ void NeutralCorbaDouble::put(const void *data) throw(ConversionException) * \param data : YACS::ENGINE::Any object */ -void NeutralCorbaDouble::put(YACS::ENGINE::Any *data) throw(ConversionException) +void NeutralCorbaDouble::put(YACS::ENGINE::Any *data) { CORBA::Any *a =convertNeutralCorba(edGetType(),data); _port->put(a); @@ -82,7 +82,7 @@ void NeutralCorbaDouble::put(YACS::ENGINE::Any *data) throw(ConversionException delete a; } -void NeutralCorbaSequence::put(const void *data) throw(ConversionException) +void NeutralCorbaSequence::put(const void *data) { put((YACS::ENGINE::Any *)data); } @@ -91,7 +91,7 @@ void NeutralCorbaSequence::put(const void *data) throw(ConversionException) /*! * \param data : Neutral::Any object */ -void NeutralCorbaSequence::put(YACS::ENGINE::Any *data) throw(ConversionException) +void NeutralCorbaSequence::put(YACS::ENGINE::Any *data) { CORBA::Any *a =convertNeutralCorba(edGetType(),data); _port->put(a); @@ -103,7 +103,7 @@ NeutralCorbaString::NeutralCorbaString(InputCorbaPort* p):ProxyPort(p), DataPort { } -void NeutralCorbaString::put(const void *data) throw(ConversionException) +void NeutralCorbaString::put(const void *data) { put((YACS::ENGINE::Any *)data); } @@ -112,7 +112,7 @@ void NeutralCorbaString::put(const void *data) throw(ConversionException) /*! * \param data : Neutral::Any object */ -void NeutralCorbaString::put(YACS::ENGINE::Any *data) throw(ConversionException) +void NeutralCorbaString::put(YACS::ENGINE::Any *data) { CORBA::Any *a =convertNeutralCorba(edGetType(),data); _port->put(a); @@ -124,7 +124,7 @@ NeutralCorbaObjref::NeutralCorbaObjref(InputCorbaPort* p):ProxyPort(p), DataPort { } -void NeutralCorbaObjref::put(const void *data) throw(ConversionException) +void NeutralCorbaObjref::put(const void *data) { put((YACS::ENGINE::Any *)data); } @@ -133,7 +133,7 @@ void NeutralCorbaObjref::put(const void *data) throw(ConversionException) /*! * \param data : Neutral::Any object */ -void NeutralCorbaObjref::put(YACS::ENGINE::Any *data) throw(ConversionException) +void NeutralCorbaObjref::put(YACS::ENGINE::Any *data) { CORBA::Any *a =convertNeutralCorba(edGetType(),data); _port->put(a); @@ -147,7 +147,7 @@ NeutralCorbaStruct::NeutralCorbaStruct(InputCorbaPort* p) { } -void NeutralCorbaStruct::put(const void *data) throw(ConversionException) +void NeutralCorbaStruct::put(const void *data) { put((YACS::ENGINE::Any *)data); } @@ -156,7 +156,7 @@ void NeutralCorbaStruct::put(const void *data) throw(ConversionException) /*! * \param data : Neutral::Any object */ -void NeutralCorbaStruct::put(YACS::ENGINE::Any *data) throw(ConversionException) +void NeutralCorbaStruct::put(YACS::ENGINE::Any *data) { CORBA::Any *a =convertNeutralCorba(edGetType(),data); _port->put(a); diff --git a/src/runtime/NeutralCORBAConv.hxx b/src/runtime/NeutralCORBAConv.hxx index e3838facb..2c1e409c8 100644 --- a/src/runtime/NeutralCORBAConv.hxx +++ b/src/runtime/NeutralCORBAConv.hxx @@ -36,8 +36,8 @@ namespace YACS public: NeutralCorbaInt(InputCorbaPort* p) : ProxyPort(p), DataPort(p->getName(), p->getNode(), p->edGetType()), Port(p->getNode()) {} - virtual void put(const void *data) throw(ConversionException); - void put(YACS::ENGINE::Any *data) throw(ConversionException); + virtual void put(const void *data); + void put(YACS::ENGINE::Any *data); }; class NeutralCorbaDouble : public ProxyPort @@ -45,8 +45,8 @@ namespace YACS public: NeutralCorbaDouble(InputCorbaPort* p) : ProxyPort(p), DataPort(p->getName(), p->getNode(), p->edGetType()), Port(p->getNode()) {} - virtual void put(const void *data) throw(ConversionException); - void put(YACS::ENGINE::Any *data) throw(ConversionException); + virtual void put(const void *data); + void put(YACS::ENGINE::Any *data); }; class NeutralCorbaBool : public ProxyPort @@ -54,8 +54,8 @@ namespace YACS public: NeutralCorbaBool(InputCorbaPort* p) : ProxyPort(p), DataPort(p->getName(), p->getNode(), p->edGetType()), Port(p->getNode()) {} - virtual void put(const void *data) throw(ConversionException); - void put(YACS::ENGINE::Any *data) throw(ConversionException); + virtual void put(const void *data); + void put(YACS::ENGINE::Any *data); }; class NeutralCorbaSequence : public ProxyPort @@ -63,32 +63,32 @@ namespace YACS public: NeutralCorbaSequence(InputCorbaPort* p) : ProxyPort(p), DataPort(p->getName(), p->getNode(), p->edGetType()), Port(p->getNode()) {} - virtual void put(const void *data) throw(ConversionException); - void put(YACS::ENGINE::Any *data) throw(ConversionException); + virtual void put(const void *data); + void put(YACS::ENGINE::Any *data); }; class NeutralCorbaString : public ProxyPort { public: NeutralCorbaString(InputCorbaPort* p); - virtual void put(const void *data) throw(ConversionException); - void put(YACS::ENGINE::Any *data) throw(ConversionException); + virtual void put(const void *data); + void put(YACS::ENGINE::Any *data); }; class NeutralCorbaObjref : public ProxyPort { public: NeutralCorbaObjref(InputCorbaPort* p); - virtual void put(const void *data) throw(ConversionException); - void put(YACS::ENGINE::Any *data) throw(ConversionException); + virtual void put(const void *data); + void put(YACS::ENGINE::Any *data); }; class NeutralCorbaStruct : public ProxyPort { public: NeutralCorbaStruct(InputCorbaPort* p); - virtual void put(const void *data) throw(ConversionException); - void put(YACS::ENGINE::Any *data) throw(ConversionException); + virtual void put(const void *data); + void put(YACS::ENGINE::Any *data); }; } } diff --git a/src/runtime/NeutralCppConv.cxx b/src/runtime/NeutralCppConv.cxx index 6b66a986f..a53fbbe7e 100644 --- a/src/runtime/NeutralCppConv.cxx +++ b/src/runtime/NeutralCppConv.cxx @@ -47,7 +47,7 @@ namespace YACS * transition method from const void* to Any* * \param data : const void * data */ - void NeutralCpp::put(const void *data) throw(ConversionException) + void NeutralCpp::put(const void *data) { put((Any *)data); } @@ -56,7 +56,7 @@ namespace YACS /*! * \param data : Any object */ - void NeutralCpp::put(Any *data) throw(ConversionException) + void NeutralCpp::put(Any *data) { Any *a = convertNeutralCpp(edGetType(),data); DEBTRACE( "before put refcnt: " << a->getRefCnt() ); diff --git a/src/runtime/NeutralCppConv.hxx b/src/runtime/NeutralCppConv.hxx index 22c3e6b4c..f27e24176 100644 --- a/src/runtime/NeutralCppConv.hxx +++ b/src/runtime/NeutralCppConv.hxx @@ -37,8 +37,8 @@ namespace YACS { public: NeutralCpp(InputCppPort* p); - virtual void put(const void *data) throw(ConversionException); - void put(YACS::ENGINE::Any *data) throw(ConversionException); + virtual void put(const void *data); + void put(YACS::ENGINE::Any *data); }; int isAdaptableCppNeutral(const TypeCode * t1, const TypeCode * t2); } diff --git a/src/runtime/NeutralInitConv.cxx b/src/runtime/NeutralInitConv.cxx index 9c9930dd8..61a4c495d 100644 --- a/src/runtime/NeutralInitConv.cxx +++ b/src/runtime/NeutralInitConv.cxx @@ -36,7 +36,7 @@ NeutralInit::NeutralInit(InputPort* p) { } -void NeutralInit::put(const void *data) throw(ConversionException) +void NeutralInit::put(const void *data) { DEBTRACE(" NeutralInit::put(const void *data)"); put((YACS::ENGINE::Any *)data); @@ -47,7 +47,7 @@ void NeutralInit::put(const void *data) throw(ConversionException) * \param data : YACS::ENGINE::Any object */ -void NeutralInit::put(YACS::ENGINE::Any *data) throw(ConversionException) +void NeutralInit::put(YACS::ENGINE::Any *data) { DEBTRACE("NeutralInit::put " << data); if(!edGetType()->isAdaptable(data->getType())) diff --git a/src/runtime/NeutralInitConv.hxx b/src/runtime/NeutralInitConv.hxx index b8febc8b9..3c58e8541 100644 --- a/src/runtime/NeutralInitConv.hxx +++ b/src/runtime/NeutralInitConv.hxx @@ -37,8 +37,8 @@ namespace YACS { public: NeutralInit(InputPort* p); - virtual void put(const void *data) throw(ConversionException); - void put(YACS::ENGINE::Any *data) throw(ConversionException); + virtual void put(const void *data) ; + void put(YACS::ENGINE::Any *data); }; } } diff --git a/src/runtime/NeutralPythonConv.cxx b/src/runtime/NeutralPythonConv.cxx index 400571740..c25230df5 100644 --- a/src/runtime/NeutralPythonConv.cxx +++ b/src/runtime/NeutralPythonConv.cxx @@ -30,7 +30,7 @@ using namespace YACS::ENGINE; using namespace std; -void NeutralPyDouble::put(const void *data) throw(ConversionException) +void NeutralPyDouble::put(const void *data) { put((YACS::ENGINE::Any *)data); } @@ -39,7 +39,7 @@ void NeutralPyDouble::put(const void *data) throw(ConversionException) /*! * \param data : YACS::ENGINE::Any object */ -void NeutralPyDouble::put(YACS::ENGINE::Any *data) throw(ConversionException) +void NeutralPyDouble::put(YACS::ENGINE::Any *data) { InterpreterUnlocker loc; PyObject* ob=convertNeutralPyObject(edGetType(),data); @@ -49,7 +49,7 @@ void NeutralPyDouble::put(YACS::ENGINE::Any *data) throw(ConversionException) } -void NeutralPyInt::put(const void *data) throw(ConversionException) +void NeutralPyInt::put(const void *data) { put((YACS::ENGINE::Any *)data); } @@ -58,7 +58,7 @@ void NeutralPyInt::put(const void *data) throw(ConversionException) /*! * \param data : YACS::ENGINE::Any object */ -void NeutralPyInt::put(YACS::ENGINE::Any *data) throw(ConversionException) +void NeutralPyInt::put(YACS::ENGINE::Any *data) { InterpreterUnlocker loc; PyObject* ob=convertNeutralPyObject(edGetType(),data); @@ -67,7 +67,7 @@ void NeutralPyInt::put(YACS::ENGINE::Any *data) throw(ConversionException) Py_DECREF(ob); } -void NeutralPyString::put(const void *data) throw(ConversionException) +void NeutralPyString::put(const void *data) { put((YACS::ENGINE::Any *)data); } @@ -76,7 +76,7 @@ void NeutralPyString::put(const void *data) throw(ConversionException) /*! * \param data : YACS::ENGINE::Any object */ -void NeutralPyString::put(YACS::ENGINE::Any *data) throw(ConversionException) +void NeutralPyString::put(YACS::ENGINE::Any *data) { InterpreterUnlocker loc; PyObject* ob=convertNeutralPyObject(edGetType(),data); @@ -85,7 +85,7 @@ void NeutralPyString::put(YACS::ENGINE::Any *data) throw(ConversionException) Py_DECREF(ob); } -void NeutralPyBool::put(const void *data) throw(ConversionException) +void NeutralPyBool::put(const void *data) { put((YACS::ENGINE::Any *)data); } @@ -94,7 +94,7 @@ void NeutralPyBool::put(const void *data) throw(ConversionException) /*! * \param data : YACS::ENGINE::Any object */ -void NeutralPyBool::put(YACS::ENGINE::Any *data) throw(ConversionException) +void NeutralPyBool::put(YACS::ENGINE::Any *data) { InterpreterUnlocker loc; PyObject* ob=convertNeutralPyObject(edGetType(),data); @@ -103,7 +103,7 @@ void NeutralPyBool::put(YACS::ENGINE::Any *data) throw(ConversionException) Py_DECREF(ob); } -void NeutralPyObjref::put(const void *data) throw(ConversionException) +void NeutralPyObjref::put(const void *data) { put((YACS::ENGINE::Any *)data); } @@ -112,7 +112,7 @@ void NeutralPyObjref::put(const void *data) throw(ConversionException) /*! * \param data : Neutral::Any object */ -void NeutralPyObjref::put(YACS::ENGINE::Any *data) throw(ConversionException) +void NeutralPyObjref::put(YACS::ENGINE::Any *data) { InterpreterUnlocker loc; PyObject* ob=convertNeutralPyObject(edGetType(),data); @@ -122,7 +122,7 @@ void NeutralPyObjref::put(YACS::ENGINE::Any *data) throw(ConversionException) DEBTRACE( "ob refcnt: " << ob->ob_refcnt ); } -void NeutralPySequence::put(const void *data) throw(ConversionException) +void NeutralPySequence::put(const void *data) { put((YACS::ENGINE::Any *)data); } @@ -131,7 +131,7 @@ void NeutralPySequence::put(const void *data) throw(ConversionException) /*! * \param data : Neutral::Any object */ -void NeutralPySequence::put(YACS::ENGINE::Any *data) throw(ConversionException) +void NeutralPySequence::put(YACS::ENGINE::Any *data) { DEBTRACE( "--------NeutralPySequence::put" ); InterpreterUnlocker loc; @@ -147,7 +147,7 @@ void NeutralPySequence::put(YACS::ENGINE::Any *data) throw(ConversionException) DEBTRACE( "ob refcnt: " << ob->ob_refcnt ); } -void NeutralPyStruct::put(const void *data) throw(ConversionException) +void NeutralPyStruct::put(const void *data) { put((YACS::ENGINE::Any *)data); } @@ -156,7 +156,7 @@ void NeutralPyStruct::put(const void *data) throw(ConversionException) /*! * \param data : Neutral::Any object */ -void NeutralPyStruct::put(YACS::ENGINE::Any *data) throw(ConversionException) +void NeutralPyStruct::put(YACS::ENGINE::Any *data) { InterpreterUnlocker loc; PyObject* ob=convertNeutralPyObject(edGetType(),data); diff --git a/src/runtime/NeutralPythonConv.hxx b/src/runtime/NeutralPythonConv.hxx index aa1bdcea4..084e2f4ce 100644 --- a/src/runtime/NeutralPythonConv.hxx +++ b/src/runtime/NeutralPythonConv.hxx @@ -33,8 +33,8 @@ namespace YACS public: NeutralPyDouble(InputPyPort* p) : ProxyPort(p), DataPort(p->getName(), p->getNode(), p->edGetType()), Port(p->getNode()) {} - virtual void put(const void *data) throw(ConversionException); - void put(YACS::ENGINE::Any *data) throw(ConversionException); + virtual void put(const void *data); + void put(YACS::ENGINE::Any *data); }; class NeutralPyInt : public ProxyPort @@ -42,8 +42,8 @@ namespace YACS public: NeutralPyInt(InputPyPort* p) : ProxyPort(p), DataPort(p->getName(), p->getNode(), p->edGetType()), Port(p->getNode()) {} - virtual void put(const void *data) throw(ConversionException); - void put(YACS::ENGINE::Any *data) throw(ConversionException); + virtual void put(const void *data); + void put(YACS::ENGINE::Any *data); }; class NeutralPyString : public ProxyPort @@ -51,8 +51,8 @@ namespace YACS public: NeutralPyString(InputPyPort* p) : ProxyPort(p), DataPort(p->getName(), p->getNode(), p->edGetType()), Port(p->getNode()) {} - virtual void put(const void *data) throw(ConversionException); - void put(YACS::ENGINE::Any *data) throw(ConversionException); + virtual void put(const void *data); + void put(YACS::ENGINE::Any *data); }; class NeutralPyBool : public ProxyPort @@ -60,8 +60,8 @@ namespace YACS public: NeutralPyBool(InputPyPort* p) : ProxyPort(p), DataPort(p->getName(), p->getNode(), p->edGetType()), Port(p->getNode()) {} - virtual void put(const void *data) throw(ConversionException); - void put(YACS::ENGINE::Any *data) throw(ConversionException); + virtual void put(const void *data); + void put(YACS::ENGINE::Any *data); }; class NeutralPyObjref : public ProxyPort @@ -69,8 +69,8 @@ namespace YACS public: NeutralPyObjref(InputPyPort* p) : ProxyPort(p), DataPort(p->getName(), p->getNode(), p->edGetType()), Port(p->getNode()) {} - virtual void put(const void *data) throw(ConversionException); - void put(YACS::ENGINE::Any *data) throw(ConversionException); + virtual void put(const void *data); + void put(YACS::ENGINE::Any *data); }; class NeutralPySequence : public ProxyPort @@ -78,8 +78,8 @@ namespace YACS public: NeutralPySequence(InputPyPort* p) : ProxyPort(p), DataPort(p->getName(), p->getNode(), p->edGetType()), Port(p->getNode()) {} - virtual void put(const void *data) throw(ConversionException); - void put(YACS::ENGINE::Any *data) throw(ConversionException); + virtual void put(const void *data); + void put(YACS::ENGINE::Any *data); }; class NeutralPyStruct : public ProxyPort @@ -87,8 +87,8 @@ namespace YACS public: NeutralPyStruct(InputPyPort* p) : ProxyPort(p), DataPort(p->getName(), p->getNode(), p->edGetType()), Port(p->getNode()) {} - virtual void put(const void *data) throw(ConversionException); - void put(YACS::ENGINE::Any *data) throw(ConversionException); + virtual void put(const void *data); + void put(YACS::ENGINE::Any *data); }; } } diff --git a/src/runtime/NeutralXMLConv.cxx b/src/runtime/NeutralXMLConv.cxx index e5b5474d7..60c8927b9 100644 --- a/src/runtime/NeutralXMLConv.cxx +++ b/src/runtime/NeutralXMLConv.cxx @@ -35,7 +35,7 @@ NeutralXml::NeutralXml(InputXmlPort* p) { } -void NeutralXml::put(const void *data) throw(ConversionException) +void NeutralXml::put(const void *data) { DEBTRACE(" NeutralXml::put(const void *data)"); put((YACS::ENGINE::Any *)data); @@ -46,7 +46,7 @@ void NeutralXml::put(const void *data) throw(ConversionException) * \param data : YACS::ENGINE::Any object */ -void NeutralXml::put(YACS::ENGINE::Any *data) throw(ConversionException) +void NeutralXml::put(YACS::ENGINE::Any *data) { DEBTRACE("NeutralXml::put " << data); std::string sss = convertNeutralXml(edGetType(),data); diff --git a/src/runtime/NeutralXMLConv.hxx b/src/runtime/NeutralXMLConv.hxx index 148609968..082ce07f7 100644 --- a/src/runtime/NeutralXMLConv.hxx +++ b/src/runtime/NeutralXMLConv.hxx @@ -37,8 +37,8 @@ namespace YACS { public: NeutralXml(InputXmlPort* p); - virtual void put(const void *data) throw(ConversionException); - void put(YACS::ENGINE::Any *data) throw(ConversionException); + virtual void put(const void *data) ; + void put(YACS::ENGINE::Any *data); }; } } diff --git a/src/runtime/OutNode.cxx b/src/runtime/OutNode.cxx index 715308166..8aa9614bf 100644 --- a/src/runtime/OutNode.cxx +++ b/src/runtime/OutNode.cxx @@ -107,7 +107,7 @@ void OutNode::setData(InputPort* port, const std::string& data) inp->setData(data); } -void OutNode::checkBasicConsistency() const throw(YACS::Exception) +void OutNode::checkBasicConsistency() const { DEBTRACE("OutNode::checkBasicConsistency"); if (! _setOfOutputPort.empty()) diff --git a/src/runtime/OutNode.hxx b/src/runtime/OutNode.hxx index 25fe42196..1e1e4fad6 100644 --- a/src/runtime/OutNode.hxx +++ b/src/runtime/OutNode.hxx @@ -35,7 +35,7 @@ namespace YACS OutNode(const OutNode& other, ComposedNode *father); virtual void execute(); virtual void accept(Visitor *visitor); - virtual void checkBasicConsistency() const throw(Exception); + virtual void checkBasicConsistency() const ; virtual void setData(InputPort* port, const std::string& data); virtual void dump(std::ostream &os); virtual InputPort *createInputPort(const std::string& inputPortName, TypeCode* type); diff --git a/src/runtime/PresetNode.cxx b/src/runtime/PresetNode.cxx index bde716b81..cd70b7eca 100644 --- a/src/runtime/PresetNode.cxx +++ b/src/runtime/PresetNode.cxx @@ -81,7 +81,7 @@ void PresetNode::setData(OutputPort* port, const std::string& data) outp->setData(data); } -void PresetNode::checkBasicConsistency() const throw(YACS::Exception) +void PresetNode::checkBasicConsistency() const { DEBTRACE("PresetNode::checkBasicConsistency"); if (! _setOfInputPort.empty()) diff --git a/src/runtime/PresetNode.hxx b/src/runtime/PresetNode.hxx index 7e3c2c927..4ac7f259c 100644 --- a/src/runtime/PresetNode.hxx +++ b/src/runtime/PresetNode.hxx @@ -36,7 +36,7 @@ namespace YACS PresetNode(const PresetNode& other, ComposedNode *father); virtual void execute(); virtual void accept(Visitor *visitor); - virtual void checkBasicConsistency() const throw(Exception); + virtual void checkBasicConsistency() const ; virtual void setData(OutputPort* port, const std::string& data); virtual OutputPort *createOutputPort(const std::string& outputPortName, TypeCode* type); virtual std::string typeName() {return "YACS__ENGINE__PresetNode";} diff --git a/src/runtime/PresetPorts.cxx b/src/runtime/PresetPorts.cxx index dae07b9b6..88f8a036b 100644 --- a/src/runtime/PresetPorts.cxx +++ b/src/runtime/PresetPorts.cxx @@ -63,7 +63,7 @@ void OutputPresetPort::setData(std::string data) modified(); } -void OutputPresetPort::checkBasicConsistency() const throw(YACS::Exception) +void OutputPresetPort::checkBasicConsistency() const { DEBTRACE("OutputPresetPort::checkBasicConsistency " << _storeData); if (_storeData.empty()) diff --git a/src/runtime/PresetPorts.hxx b/src/runtime/PresetPorts.hxx index f3ecdc25b..66110f73d 100644 --- a/src/runtime/PresetPorts.hxx +++ b/src/runtime/PresetPorts.hxx @@ -37,7 +37,7 @@ namespace YACS OutputPort *clone(Node *newHelder) const; void setData(std::string data); std::string getData(); - virtual void checkBasicConsistency() const throw(Exception); + virtual void checkBasicConsistency() const ; virtual std::string dump(); virtual std::string getAsString(); virtual PyObject* getPyObj(); diff --git a/src/runtime/PyOptimizerAlg.cxx b/src/runtime/PyOptimizerAlg.cxx index 35677fb48..e417604d5 100644 --- a/src/runtime/PyOptimizerAlg.cxx +++ b/src/runtime/PyOptimizerAlg.cxx @@ -69,7 +69,7 @@ void PyOptimizerAlgBase::finishProxy() OptimizerAlgBase::finishProxy(); } -void PyOptimizerAlgBase::initializeProxy(const Any *input) throw (YACS::Exception) +void PyOptimizerAlgBase::initializeProxy(const Any *input) { GILState gs; OptimizerAlgBase::initializeProxy(input); diff --git a/src/runtime/PyOptimizerAlg.hxx b/src/runtime/PyOptimizerAlg.hxx index a6b9fa391..612e9a7e8 100644 --- a/src/runtime/PyOptimizerAlg.hxx +++ b/src/runtime/PyOptimizerAlg.hxx @@ -38,7 +38,7 @@ namespace YACS virtual TypeCode *getTCForOutProxy() const; virtual TypeCode *getTCForAlgoInitProxy() const; virtual TypeCode *getTCForAlgoResultProxy() const; - virtual void initializeProxy(const Any *input) throw (Exception); + virtual void initializeProxy(const Any *input) ; virtual void startProxy(); virtual void takeDecisionProxy(); virtual void finishProxy(); diff --git a/src/runtime/PythonCORBAConv.cxx b/src/runtime/PythonCORBAConv.cxx index 94858df7a..54c0fb010 100644 --- a/src/runtime/PythonCORBAConv.cxx +++ b/src/runtime/PythonCORBAConv.cxx @@ -42,7 +42,7 @@ using namespace std; /*!Convert a PyObject (integer) to CORBA::Any (integer) * It's only a wrapper around put(PyObject *data) */ -void PyCorbaInt::put(const void *data) throw(ConversionException) +void PyCorbaInt::put(const void *data) { put((PyObject *)data); } @@ -51,7 +51,7 @@ void PyCorbaInt::put(const void *data) throw(ConversionException) /*! * \param data : python object */ -void PyCorbaInt::put(PyObject *data) throw(ConversionException) +void PyCorbaInt::put(PyObject *data) { CORBA::Any *a= convertPyObjectCorba(_port->edGetType(),data); YACS::ENGINE::InterpreterSaveThread _loc; @@ -65,7 +65,7 @@ void PyCorbaInt::put(PyObject *data) throw(ConversionException) * * \param data : python object */ -void PyCorbaBool::put(const void *data) throw(ConversionException) +void PyCorbaBool::put(const void *data) { put((PyObject *)data); } @@ -76,7 +76,7 @@ void PyCorbaBool::put(const void *data) throw(ConversionException) * * \param data : python object */ -void PyCorbaBool::put(PyObject *data) throw(ConversionException) +void PyCorbaBool::put(PyObject *data) { CORBA::Any *a= convertPyObjectCorba(_port->edGetType(),data); YACS::ENGINE::InterpreterSaveThread _loc; @@ -85,7 +85,7 @@ void PyCorbaBool::put(PyObject *data) throw(ConversionException) delete a; } -void PyCorbaString::put(const void *data) throw(ConversionException) +void PyCorbaString::put(const void *data) { put((PyObject *)data); } @@ -95,7 +95,7 @@ void PyCorbaString::put(const void *data) throw(ConversionException) * \param data : python object */ -void PyCorbaString::put(PyObject *data) throw(ConversionException) +void PyCorbaString::put(PyObject *data) { CORBA::Any *a= convertPyObjectCorba(_port->edGetType(),data); YACS::ENGINE::InterpreterSaveThread _loc; @@ -104,7 +104,7 @@ void PyCorbaString::put(PyObject *data) throw(ConversionException) } -void PyCorbaDouble::put(const void *data) throw(ConversionException) +void PyCorbaDouble::put(const void *data) { put((PyObject *)data); } @@ -114,7 +114,7 @@ void PyCorbaDouble::put(const void *data) throw(ConversionException) * \param data : python object */ -void PyCorbaDouble::put(PyObject *data) throw(ConversionException) +void PyCorbaDouble::put(PyObject *data) { CORBA::Any *a= convertPyObjectCorba(_port->edGetType(),data); YACS::ENGINE::InterpreterSaveThread _loc; @@ -136,12 +136,12 @@ PyCorbaSequence::PyCorbaSequence(InputCorbaPort* p) * \param data : python object */ -void PyCorbaSequence::put(const void *data) throw(ConversionException) +void PyCorbaSequence::put(const void *data) { put((PyObject *)data); } -void PyCorbaSequence::put(PyObject *data) throw(ConversionException) +void PyCorbaSequence::put(PyObject *data) { DEBTRACE("data refcnt: " << data->ob_refcnt); #ifdef _DEVDEBUG_ @@ -178,12 +178,12 @@ PyCorbaObjref::PyCorbaObjref(InputCorbaPort* p) * \param data : python object */ -void PyCorbaObjref::put(const void *data) throw(ConversionException) +void PyCorbaObjref::put(const void *data) { put((PyObject *)data); } -void PyCorbaObjref::put(PyObject *data) throw(ConversionException) +void PyCorbaObjref::put(PyObject *data) { DEBTRACE("data refcnt: " << data->ob_refcnt); #ifdef _DEVDEBUG_ @@ -205,7 +205,7 @@ PyCorbaStruct::PyCorbaStruct(InputCorbaPort* p) { } -void PyCorbaStruct::put(const void *data) throw(ConversionException) +void PyCorbaStruct::put(const void *data) { put((PyObject *)data); } @@ -214,7 +214,7 @@ void PyCorbaStruct::put(const void *data) throw(ConversionException) /*! * \param data : python object */ -void PyCorbaStruct::put(PyObject *data) throw(ConversionException) +void PyCorbaStruct::put(PyObject *data) { DEBTRACE("data refcnt: " << data->ob_refcnt); #ifdef _DEVDEBUG_ diff --git a/src/runtime/PythonCORBAConv.hxx b/src/runtime/PythonCORBAConv.hxx index e898a6922..5cfe15edd 100644 --- a/src/runtime/PythonCORBAConv.hxx +++ b/src/runtime/PythonCORBAConv.hxx @@ -36,8 +36,8 @@ namespace YACS public: PyCorbaInt(InputCorbaPort* p) : ProxyPort(p), DataPort(p->getName(), p->getNode(), p->edGetType()), Port(p->getNode()) {} - virtual void put(const void *data) throw(ConversionException); - void put(PyObject *data) throw(ConversionException); + virtual void put(const void *data); + void put(PyObject *data); }; class PyCorbaDouble : public ProxyPort @@ -45,8 +45,8 @@ namespace YACS public: PyCorbaDouble(InputCorbaPort* p) : ProxyPort(p), DataPort(p->getName(), p->getNode(), p->edGetType()), Port(p->getNode()) {} - virtual void put(const void *data) throw(ConversionException); - void put(PyObject *data) throw(ConversionException); + virtual void put(const void *data); + void put(PyObject *data); }; class PyCorbaString : public ProxyPort @@ -54,8 +54,8 @@ namespace YACS public: PyCorbaString(InputCorbaPort* p) : ProxyPort(p), DataPort(p->getName(), p->getNode(), p->edGetType()), Port(p->getNode()) {} - virtual void put(const void *data) throw(ConversionException); - void put(PyObject *data) throw(ConversionException); + virtual void put(const void *data); + void put(PyObject *data); }; class PyCorbaBool : public ProxyPort @@ -63,16 +63,16 @@ namespace YACS public: PyCorbaBool(InputCorbaPort* p) : ProxyPort(p), DataPort(p->getName(), p->getNode(), p->edGetType()), Port(p->getNode()) {} - virtual void put(const void *data) throw(ConversionException); - void put(PyObject *data) throw(ConversionException); + virtual void put(const void *data); + void put(PyObject *data); }; class PyCorbaObjref : public ProxyPort { public: PyCorbaObjref(InputCorbaPort* p); - virtual void put(const void *data) throw(ConversionException); - void put(PyObject *data) throw(ConversionException); + virtual void put(const void *data); + void put(PyObject *data); protected: PyObject * _pyorb; CORBA::ORB_ptr _orb; @@ -82,16 +82,16 @@ namespace YACS { public: PyCorbaSequence(InputCorbaPort* p); - virtual void put(const void *data) throw(ConversionException); - void put(PyObject *data) throw(ConversionException); + virtual void put(const void *data); + void put(PyObject *data); }; class PyCorbaStruct : public ProxyPort { public: PyCorbaStruct(InputCorbaPort* p); - virtual void put(const void *data) throw(ConversionException); - void put(PyObject *data) throw(ConversionException); + virtual void put(const void *data); + void put(PyObject *data); }; } diff --git a/src/runtime/PythonCppConv.cxx b/src/runtime/PythonCppConv.cxx index a5a4c3fe6..a0903fa51 100644 --- a/src/runtime/PythonCppConv.cxx +++ b/src/runtime/PythonCppConv.cxx @@ -38,7 +38,7 @@ namespace YACS return convertPyObjectNeutral(t, data); } - void PyCpp::put(const void *data) throw(ConversionException) + void PyCpp::put(const void *data) { put((PyObject *)data); } @@ -48,7 +48,7 @@ namespace YACS * \param data : python object */ - void PyCpp::put(PyObject *data) throw(ConversionException) + void PyCpp::put(PyObject *data) { YACS::ENGINE::Any *a; //Do not need to take the Python GIL as put is called from Python node diff --git a/src/runtime/PythonCppConv.hxx b/src/runtime/PythonCppConv.hxx index c39edc1ae..52963b92f 100644 --- a/src/runtime/PythonCppConv.hxx +++ b/src/runtime/PythonCppConv.hxx @@ -34,8 +34,8 @@ namespace YACS public: PyCpp(InputCppPort* p) : ProxyPort(p), DataPort(p->getName(), p->getNode(), p->edGetType()), Port(p->getNode()) {} - virtual void put(const void *data) throw(ConversionException); - void put(PyObject *data) throw(ConversionException); + virtual void put(const void *data) ; + void put(PyObject *data); }; int isAdaptableCppPyObject(const TypeCode *t1, const TypeCode *t2); } diff --git a/src/runtime/PythonInitConv.cxx b/src/runtime/PythonInitConv.cxx index 3f67346dc..907af39ec 100644 --- a/src/runtime/PythonInitConv.cxx +++ b/src/runtime/PythonInitConv.cxx @@ -39,7 +39,7 @@ PyInit::PyInit(InputPyPort* p) * \param data : PyObject object as a void * pointer */ -void PyInit::put(const void *data) throw(ConversionException) +void PyInit::put(const void *data) { put((PyObject *)data); } @@ -48,7 +48,7 @@ void PyInit::put(const void *data) throw(ConversionException) /*! * \param data : PyObject object */ -void PyInit::put(PyObject *data) throw(ConversionException) +void PyInit::put(PyObject *data) { DEBTRACE("PyInit::put(PyObject *data)"<ob_refcnt); InterpreterUnlocker l; diff --git a/src/runtime/PythonInitConv.hxx b/src/runtime/PythonInitConv.hxx index 620d1dba6..2368f5ee0 100644 --- a/src/runtime/PythonInitConv.hxx +++ b/src/runtime/PythonInitConv.hxx @@ -34,8 +34,8 @@ namespace YACS { public: PyInit(InputPyPort* p); - virtual void put(const void *data) throw(ConversionException); - void put(PyObject *data) throw(ConversionException); + virtual void put(const void *data); + void put(PyObject *data); }; } } diff --git a/src/runtime/PythonNeutralConv.cxx b/src/runtime/PythonNeutralConv.cxx index 82840c880..5db7338fb 100644 --- a/src/runtime/PythonNeutralConv.cxx +++ b/src/runtime/PythonNeutralConv.cxx @@ -36,7 +36,7 @@ PyNeutral::PyNeutral(InputPort* p) { } -void PyNeutral::put(const void *data) throw(ConversionException) +void PyNeutral::put(const void *data) { DEBTRACE( " PyNeutral::put(const void *data)" ); put((PyObject *)data); @@ -47,7 +47,7 @@ void PyNeutral::put(const void *data) throw(ConversionException) * \param data : Python value */ -void PyNeutral::put(PyObject *data) throw(ConversionException) +void PyNeutral::put(PyObject *data) { DEBTRACE( "PyNeutral::put " ); YACS::ENGINE::Any *ob; diff --git a/src/runtime/PythonNeutralConv.hxx b/src/runtime/PythonNeutralConv.hxx index 39f3c071f..f2ff09208 100644 --- a/src/runtime/PythonNeutralConv.hxx +++ b/src/runtime/PythonNeutralConv.hxx @@ -33,8 +33,8 @@ namespace YACS { public: PyNeutral(InputPort* p); - virtual void put(const void *data) throw(ConversionException); - void put(PyObject *data) throw(ConversionException); + virtual void put(const void *data) ; + void put(PyObject *data); }; } } diff --git a/src/runtime/PythonNode.cxx b/src/runtime/PythonNode.cxx index 03d17def5..547d23360 100644 --- a/src/runtime/PythonNode.cxx +++ b/src/runtime/PythonNode.cxx @@ -345,7 +345,7 @@ PythonNode::~PythonNode() } } -void PythonNode::checkBasicConsistency() const throw(YACS::Exception) +void PythonNode::checkBasicConsistency() const { DEBTRACE("checkBasicConsistency"); InlineNode::checkBasicConsistency(); @@ -894,7 +894,7 @@ void PyFuncNode::init(bool start) setState(YACS::TORECONNECT); } -void PyFuncNode::checkBasicConsistency() const throw(YACS::Exception) +void PyFuncNode::checkBasicConsistency() const { DEBTRACE("checkBasicConsistency"); InlineFuncNode::checkBasicConsistency(); diff --git a/src/runtime/PythonNode.hxx b/src/runtime/PythonNode.hxx index 8e05906df..def2b876f 100644 --- a/src/runtime/PythonNode.hxx +++ b/src/runtime/PythonNode.hxx @@ -73,7 +73,7 @@ namespace YACS PythonNode(const PythonNode& other, ComposedNode *father); PythonNode(const std::string& name); virtual ~PythonNode(); - virtual void checkBasicConsistency() const throw(Exception); + virtual void checkBasicConsistency() const ; virtual void execute(); virtual void load(); virtual void loadRemote(); @@ -117,7 +117,7 @@ namespace YACS PyFuncNode(const std::string& name); virtual ~PyFuncNode(); virtual void init(bool start=true); - virtual void checkBasicConsistency() const throw(Exception); + virtual void checkBasicConsistency() const ; virtual void execute(); virtual void load(); virtual void loadRemote(); diff --git a/src/runtime/PythonPorts.cxx b/src/runtime/PythonPorts.cxx index f774a576f..271745169 100644 --- a/src/runtime/PythonPorts.cxx +++ b/src/runtime/PythonPorts.cxx @@ -154,7 +154,7 @@ void InputPyPort::edRemoveManInit() InputPort::edRemoveManInit(); } -void InputPyPort::put(const void *data) throw(ConversionException) +void InputPyPort::put(const void *data) { put((PyObject *)data); } @@ -172,7 +172,7 @@ void InputPyPort::releaseData() InputPyPort::releaseDataUnsafe(); } -void InputPyPort::put(PyObject *data) throw(ConversionException) +void InputPyPort::put(PyObject *data) { InterpreterUnlocker l; InputPyPort::releaseDataUnsafe(); @@ -194,7 +194,7 @@ PyObject * InputPyPort::getPyObj() const return _data; } -void *InputPyPort::get() const throw(YACS::Exception) +void *InputPyPort::get() const { return (void*) _data; } @@ -311,12 +311,12 @@ OutputPyPort::OutputPyPort(const OutputPyPort& other, Node *newHelder):OutputPor Py_INCREF(_data); } -void OutputPyPort::put(const void *data) throw(ConversionException) +void OutputPyPort::put(const void *data) { put((PyObject *)data); } -void OutputPyPort::putWithoutForward(PyObject *data) throw(ConversionException) +void OutputPyPort::putWithoutForward(PyObject *data) { DEBTRACE( "OutputPyPort::put.ob refcnt: " << data->ob_refcnt ); #ifdef _DEVDEBUG_ @@ -330,7 +330,7 @@ void OutputPyPort::putWithoutForward(PyObject *data) throw(ConversionException) //no registerPyObj : we steal the output reference of the node } -void OutputPyPort::put(PyObject *data) throw(ConversionException) +void OutputPyPort::put(PyObject *data) { putWithoutForward(data); DEBTRACE( "OutputPyPort::put.ob refcnt: " << data->ob_refcnt ); diff --git a/src/runtime/PythonPorts.hxx b/src/runtime/PythonPorts.hxx index 9945a1c43..324d71ab5 100644 --- a/src/runtime/PythonPorts.hxx +++ b/src/runtime/PythonPorts.hxx @@ -78,14 +78,14 @@ namespace YACS ~InputPyPort(); bool edIsManuallyInitialized() const; void edRemoveManInit(); - virtual void put(const void *data) throw(ConversionException); + virtual void put(const void *data); void releaseData() override; - void put(PyObject *data) throw(ConversionException); + void put(PyObject *data); InputPort *clone(Node *newHelder) const; //special typedef PyObj used in SWIG to increment ref count on output virtual PyObj * getPyObj() const; virtual std::string getAsString(); - void *get() const throw(Exception); + void *get() const ; virtual std::string getHumanRepr(); virtual bool isEmpty(); virtual void exSaveInit(); @@ -108,9 +108,9 @@ namespace YACS OutputPyPort(const std::string& name, Node * node, TypeCode * type); OutputPyPort(const OutputPyPort& other, Node *newHelder); ~OutputPyPort(); - virtual void put(const void *data) throw(ConversionException); - void putWithoutForward(PyObject *data) throw(ConversionException); - void put(PyObject *data) throw(ConversionException); + virtual void put(const void *data); + void putWithoutForward(PyObject *data); + void put(PyObject *data); OutputPort *clone(Node *newHelder) const; virtual PyObject * get() const; //special typedef PyObj used in SWIG to increment ref count on output diff --git a/src/runtime/PythonXMLConv.cxx b/src/runtime/PythonXMLConv.cxx index b5b7c5009..490688e85 100644 --- a/src/runtime/PythonXMLConv.cxx +++ b/src/runtime/PythonXMLConv.cxx @@ -40,7 +40,7 @@ PyXml::PyXml(InputXmlPort* p) * \param data : PyObject object as a void * pointer */ -void PyXml::put(const void *data) throw(ConversionException) +void PyXml::put(const void *data) { put((PyObject *)data); } @@ -49,7 +49,7 @@ void PyXml::put(const void *data) throw(ConversionException) /*! * \param data : PyObject object */ -void PyXml::put(PyObject *data) throw(ConversionException) +void PyXml::put(PyObject *data) { DEBTRACE("PyXml::put" ); std::string sss = convertPyObjectXml(edGetType(),data); diff --git a/src/runtime/PythonXMLConv.hxx b/src/runtime/PythonXMLConv.hxx index b334a94fe..aaa9310d2 100644 --- a/src/runtime/PythonXMLConv.hxx +++ b/src/runtime/PythonXMLConv.hxx @@ -33,8 +33,8 @@ namespace YACS { public: PyXml(InputXmlPort* p); - virtual void put(const void *data) throw(ConversionException); - void put(PyObject *data) throw(ConversionException); + virtual void put(const void *data); + void put(PyObject *data); }; } } diff --git a/src/runtime/RuntimeSALOME.cxx b/src/runtime/RuntimeSALOME.cxx index 99445ce56..94b205986 100644 --- a/src/runtime/RuntimeSALOME.cxx +++ b/src/runtime/RuntimeSALOME.cxx @@ -774,7 +774,7 @@ OutputDataStreamPort* RuntimeSALOME::createOutputDataStreamPort(const std::strin */ InputPort* RuntimeSALOME::adapt(InputPort* source, const std::string& impl, - TypeCode * type,bool init) throw (ConversionException) + TypeCode * type,bool init) { string imp_source=source->getNode()->getImplementation(); if(imp_source == PythonNode::IMPL_NAME) @@ -817,7 +817,7 @@ InputPort* RuntimeSALOME::adapt(InputPort* source, */ InputPort* RuntimeSALOME::adapt(InPropertyPort* source, const std::string& impl, - TypeCode * type,bool init) throw (ConversionException) + TypeCode * type,bool init) { return adaptNeutral((InputPort *)source,impl,type,init); } @@ -829,7 +829,7 @@ InputPort* RuntimeSALOME::adapt(InPropertyPort* source, * \return an adaptated input port of type InputCorbaPort */ InputPort* RuntimeSALOME::adaptNeutralToCorba(InputPort* inport, - TypeCode * type) throw (ConversionException) + TypeCode * type) { // BEWARE : using the generic check if(inport->edGetType()->isAdaptable(type)) @@ -854,7 +854,7 @@ InputPort* RuntimeSALOME::adaptNeutralToCorba(InputPort* inport, * \return an adaptated input port of type InputPyPort */ InputPort* RuntimeSALOME::adaptNeutralToPython(InputPort* inport, - TypeCode * type) throw (ConversionException) + TypeCode * type) { // BEWARE : using the generic check if(inport->edGetType()->isAdaptable(type)) @@ -884,7 +884,7 @@ InputPort* RuntimeSALOME::adaptNeutralToPython(InputPort* inport, * \return an input port of type InputXmlPort */ InputPort* RuntimeSALOME::adaptNeutralToXml(InputPort* inport, - TypeCode * type) throw (ConversionException) + TypeCode * type) { // BEWARE : using the generic check if(inport->edGetType()->isAdaptable(type)) @@ -909,7 +909,7 @@ InputPort* RuntimeSALOME::adaptNeutralToXml(InputPort* inport, * \return an input port of type InputCppPort */ InputPort* RuntimeSALOME::adaptNeutralToCpp(InputPort* inport, - TypeCode * type) throw (ConversionException) + TypeCode * type) { DEBTRACE("RuntimeSALOME::adaptNeutralToCpp(InputPort* inport" ); if(isAdaptableNeutralCpp(type,inport->edGetType())) @@ -937,7 +937,7 @@ InputPort* RuntimeSALOME::adaptNeutralToCpp(InputPort* inport, */ InputPort* RuntimeSALOME::adaptNeutral(InputPort* source, const std::string& impl, - TypeCode * type,bool init) throw (ConversionException) + TypeCode * type,bool init) { if(impl == CppNode::IMPL_NAME) { @@ -976,7 +976,7 @@ InputPort* RuntimeSALOME::adaptNeutral(InputPort* source, */ InputPort* RuntimeSALOME::adaptXmlToCorba(InputXmlPort* inport, - TypeCode * type) throw (ConversionException) + TypeCode * type) { if(isAdaptableXmlCorba(type,inport->edGetType())) { @@ -1000,7 +1000,7 @@ InputPort* RuntimeSALOME::adaptXmlToCorba(InputXmlPort* inport, * \return an adaptated input port of type InputPyPort */ InputPort* RuntimeSALOME::adaptXmlToPython(InputXmlPort* inport, - TypeCode * type) throw (ConversionException) + TypeCode * type) { if(inport->edGetType()->isAdaptable(type)) { @@ -1024,7 +1024,7 @@ InputPort* RuntimeSALOME::adaptXmlToPython(InputXmlPort* inport, * \return an adaptated input port of type InputPyPort */ InputPort* RuntimeSALOME::adaptXmlToCpp(InputXmlPort* inport, - TypeCode * type) throw (ConversionException) + TypeCode * type) { DEBTRACE("RuntimeSALOME::adaptXmlToCpp(InputPort* inport" ); DEBTRACE(type->kind() << " " << inport->edGetType()->kind() ); @@ -1050,7 +1050,7 @@ InputPort* RuntimeSALOME::adaptXmlToCpp(InputXmlPort* inport, * \return an adaptated input port of type Neutralxxxx */ InputPort* RuntimeSALOME::adaptXmlToNeutral(InputXmlPort* inport, - TypeCode * type) throw (ConversionException) + TypeCode * type) { if(inport->edGetType()->isAdaptable(type)) { @@ -1072,7 +1072,7 @@ InputPort* RuntimeSALOME::adaptXmlToNeutral(InputXmlPort* inport, * \return an adaptated input port of type Xmlxxxx */ InputPort* RuntimeSALOME::adaptXmlToXml(InputXmlPort* inport, - TypeCode * type,bool init) throw (ConversionException) + TypeCode * type,bool init) { if(init) return new ProxyPort(inport); @@ -1100,7 +1100,7 @@ InputPort* RuntimeSALOME::adaptXmlToXml(InputXmlPort* inport, InputPort* RuntimeSALOME::adapt(InputXmlPort* source, const std::string& impl, - TypeCode * type,bool init) throw (ConversionException) + TypeCode * type,bool init) { if(impl == CORBANode::IMPL_NAME) { @@ -1139,7 +1139,7 @@ InputPort* RuntimeSALOME::adapt(InputXmlPort* source, * \return an adaptator port of type InputCORBAPort */ InputPort* RuntimeSALOME::adaptCorbaToCorba(InputCorbaPort* inport, - TypeCode * type) throw (ConversionException) + TypeCode * type) { if(type->isA(inport->edGetType())) { @@ -1171,7 +1171,7 @@ InputPort* RuntimeSALOME::adaptCorbaToCorba(InputCorbaPort* inport, */ InputPort* RuntimeSALOME::adaptCorbaToPython(InputCorbaPort* inport, - TypeCode * type) throw (ConversionException) + TypeCode * type) { if(inport->edGetType()->kind() == Double) { @@ -1250,7 +1250,7 @@ InputPort* RuntimeSALOME::adaptCorbaToPython(InputCorbaPort* inport, */ InputPort* RuntimeSALOME::adaptCorbaToXml(InputCorbaPort* inport, - TypeCode * type) throw (ConversionException) + TypeCode * type) { // BEWARE : using the generic check if(inport->edGetType()->isAdaptable(type)) @@ -1276,7 +1276,7 @@ InputPort* RuntimeSALOME::adaptCorbaToXml(InputCorbaPort* inport, */ InputPort* RuntimeSALOME::adaptCorbaToCpp(InputCorbaPort* inport, - TypeCode * type) throw (ConversionException) + TypeCode * type) { DEBTRACE("RuntimeSALOME::adaptCorbaToCpp(InputCorbaPort* inport" ); if(isAdaptableCorbaCpp(type,inport->edGetType())) @@ -1302,7 +1302,7 @@ InputPort* RuntimeSALOME::adaptCorbaToCpp(InputCorbaPort* inport, */ InputPort* RuntimeSALOME::adaptCorbaToNeutral(InputCorbaPort* inport, - TypeCode * type) throw (ConversionException) + TypeCode * type) { if(inport->edGetType()->kind() == Double) { @@ -1362,7 +1362,7 @@ InputPort* RuntimeSALOME::adaptCorbaToNeutral(InputCorbaPort* inport, InputPort* RuntimeSALOME::adapt(InputCorbaPort* source, const std::string& impl, - TypeCode * type,bool init) throw (ConversionException) + TypeCode * type,bool init) { if(impl == CppNode::IMPL_NAME) { @@ -1407,7 +1407,7 @@ InputPort* RuntimeSALOME::adapt(InputCorbaPort* source, */ InputPort* RuntimeSALOME::adaptPythonToPython(InputPyPort* inport, - TypeCode * type,bool init) throw (ConversionException) + TypeCode * type,bool init) { if(init) return new PyInit(inport); @@ -1437,7 +1437,7 @@ InputPort* RuntimeSALOME::adaptPythonToPython(InputPyPort* inport, */ InputPort* RuntimeSALOME::adaptPythonToCpp(InputPyPort* inport, - TypeCode * type) throw (ConversionException) + TypeCode * type) { DEBTRACE("RuntimeSALOME::adaptPythonToCpp(InputPyPort* inport" ); if(isAdaptablePyObjectCpp(type,inport->edGetType())) @@ -1463,7 +1463,7 @@ InputPort* RuntimeSALOME::adaptPythonToCpp(InputPyPort* inport, */ InputPort* RuntimeSALOME::adaptPythonToNeutral(InputPyPort* inport, - TypeCode * type) throw (ConversionException) + TypeCode * type) { if(inport->edGetType()->kind() == Double) { @@ -1521,7 +1521,7 @@ InputPort* RuntimeSALOME::adaptPythonToNeutral(InputPyPort* inport, */ InputPort* RuntimeSALOME::adaptPythonToCorba(InputPyPort* inport, - TypeCode * type) throw (ConversionException) + TypeCode * type) { if(inport->edGetType()->kind() == Double) { @@ -1599,7 +1599,7 @@ InputPort* RuntimeSALOME::adaptPythonToCorba(InputPyPort* inport, */ InputPort* RuntimeSALOME::adaptPythonToXml(InputPyPort* inport, - TypeCode * type) throw (ConversionException) + TypeCode * type) { // BEWARE : using the generic check if(inport->edGetType()->isAdaptable(type)) @@ -1628,7 +1628,7 @@ InputPort* RuntimeSALOME::adaptPythonToXml(InputPyPort* inport, InputPort* RuntimeSALOME::adapt(InputPyPort* source, const std::string& impl, - TypeCode * type,bool init) throw (ConversionException) + TypeCode * type,bool init) { if(impl == CppNode::IMPL_NAME) { @@ -1668,7 +1668,7 @@ InputPort* RuntimeSALOME::adapt(InputPyPort* source, */ InputPort* RuntimeSALOME::adaptCppToCorba(InputCppPort* inport, - TypeCode * type) throw (ConversionException) + TypeCode * type) { DEBTRACE("RuntimeSALOME::adaptCppToCorba(InputCppPort* inport)"); if(isAdaptableCppCorba(type,inport->edGetType())) @@ -1693,7 +1693,7 @@ InputPort* RuntimeSALOME::adaptCppToCorba(InputCppPort* inport, * \return an adaptated input port of type InputPyPort */ InputPort* RuntimeSALOME::adaptCppToPython(InputCppPort* inport, - TypeCode * type) throw (ConversionException) + TypeCode * type) { DEBTRACE("RuntimeSALOME::adaptCppToPython(InputCppPort* inport)"); if(isAdaptableCppPyObject(type,inport->edGetType())) @@ -1718,7 +1718,7 @@ InputPort* RuntimeSALOME::adaptCppToPython(InputCppPort* inport, * \return an adaptated input port of type InputPyPort */ InputPort* RuntimeSALOME::adaptCppToCpp(InputCppPort* inport, - TypeCode * type) throw (ConversionException) + TypeCode * type) { DEBTRACE("RuntimeSALOME::adaptCppToCpp(InputPort* inport" ); DEBTRACE(type->kind() << " " << inport->edGetType()->kind() ); @@ -1744,7 +1744,7 @@ InputPort* RuntimeSALOME::adaptCppToCpp(InputCppPort* inport, * \return an adaptated input port of type InputPyPort */ InputPort* RuntimeSALOME::adaptCppToNeutral(InputCppPort* inport, - TypeCode * type) throw (ConversionException) + TypeCode * type) { DEBTRACE("RuntimeSALOME::adaptCppToNeutral(InputPort* inport" ); DEBTRACE(type->kind() << " " << inport->edGetType()->kind() ); @@ -1764,7 +1764,7 @@ InputPort* RuntimeSALOME::adaptCppToNeutral(InputCppPort* inport, } InputPort* RuntimeSALOME::adaptCppToXml(InputCppPort* inport, - TypeCode * type) throw (ConversionException) + TypeCode * type) { DEBTRACE("RuntimeSALOME::adaptCppToXml(InputCppPort* inport" ); if(isAdaptableCppXml(type,inport->edGetType())) @@ -1793,7 +1793,7 @@ InputPort* RuntimeSALOME::adaptCppToXml(InputCppPort* inport, InputPort* RuntimeSALOME::adapt(InputCppPort* source, const std::string& impl, - TypeCode * type,bool init) throw (ConversionException) + TypeCode * type,bool init) { DEBTRACE("RuntimeSALOME::adapt(InputCppPort* source)"); if(impl == CORBANode::IMPL_NAME) diff --git a/src/runtime/RuntimeSALOME.hxx b/src/runtime/RuntimeSALOME.hxx index 8d2172979..6a637d106 100644 --- a/src/runtime/RuntimeSALOME.hxx +++ b/src/runtime/RuntimeSALOME.hxx @@ -122,103 +122,103 @@ namespace YACS virtual InputPort* adapt(InputPort* source, const std::string& impl, - TypeCode * type,bool init=false) throw (ConversionException); + TypeCode * type,bool init=false); virtual InputPort* adapt(InPropertyPort* source, const std::string& impl, - TypeCode * type,bool init=false) throw (ConversionException); + TypeCode * type,bool init=false); virtual InputPort* adaptNeutral(InputPort* source, const std::string& impl, - TypeCode * type,bool init) throw (ConversionException); + TypeCode * type,bool init); virtual InputPort* adapt(InputCorbaPort* source, const std::string& impl, - TypeCode * type,bool init) throw (ConversionException); + TypeCode * type,bool init); virtual InputPort* adaptCorbaToCorba(InputCorbaPort* source, - TypeCode * type) throw (ConversionException); + TypeCode * type); virtual InputPort* adaptCorbaToNeutral(InputCorbaPort* source, - TypeCode * type) throw (ConversionException); + TypeCode * type); virtual InputPort* adaptCorbaToPython(InputCorbaPort* source, - TypeCode * type) throw (ConversionException); + TypeCode * type); virtual InputPort* adaptCorbaToCpp(InputCorbaPort* source, - TypeCode * type) throw (ConversionException); + TypeCode * type); virtual InputPort* adaptCorbaToXml(InputCorbaPort* source, - TypeCode * type) throw (ConversionException); + TypeCode * type); virtual InputPort* adapt(InputPyPort* source, const std::string& impl, - TypeCode * type,bool init) throw (ConversionException); + TypeCode * type,bool init); virtual InputPort* adaptPythonToCorba(InputPyPort* source, - TypeCode * type) throw (ConversionException); + TypeCode * type); virtual InputPort* adaptPythonToNeutral(InputPyPort* source, - TypeCode * type) throw (ConversionException); + TypeCode * type); virtual InputPort* adaptPythonToPython(InputPyPort* source, - TypeCode * type,bool init) throw (ConversionException); + TypeCode * type,bool init); virtual InputPort* adaptPythonToXml(InputPyPort* source, - TypeCode * type) throw (ConversionException); + TypeCode * type); virtual InputPort* adaptPythonToCpp(InputPyPort* source, - TypeCode * type) throw (ConversionException); + TypeCode * type); virtual InputPort* adapt(InputCppPort* source, const std::string& impl, - TypeCode * type,bool init) throw (ConversionException); + TypeCode * type,bool init); virtual InputPort* adaptCppToCorba(InputCppPort* source, - TypeCode * type) throw (ConversionException); + TypeCode * type); virtual InputPort* adaptCppToNeutral(InputCppPort* source, - TypeCode * type) throw (ConversionException); + TypeCode * type); virtual InputPort* adaptCppToPython(InputCppPort* source, - TypeCode * type) throw (ConversionException); + TypeCode * type); virtual InputPort* adaptCppToXml(InputCppPort* source, - TypeCode * type) throw (ConversionException); + TypeCode * type); virtual InputPort* adaptCppToCpp(InputCppPort* source, - TypeCode * type) throw (ConversionException); + TypeCode * type); virtual InputPort* adapt(InputXmlPort* source, const std::string& impl, - TypeCode * type,bool init) throw (ConversionException); + TypeCode * type,bool init); virtual InputPort* adaptXmlToCorba(InputXmlPort* source, - TypeCode * type) throw (ConversionException); + TypeCode * type); virtual InputPort* adaptXmlToPython(InputXmlPort* inport, - TypeCode * type) throw (ConversionException); + TypeCode * type); virtual InputPort* adaptXmlToCpp(InputXmlPort* inport, - TypeCode * type) throw (ConversionException); + TypeCode * type); virtual InputPort* adaptXmlToNeutral(InputXmlPort* inport, - TypeCode * type) throw (ConversionException); + TypeCode * type); virtual InputPort* adaptXmlToXml(InputXmlPort* inport, - TypeCode * type,bool init) throw (ConversionException); + TypeCode * type,bool init); virtual InputPort* adaptNeutralToXml(InputPort* inport, - TypeCode * type) throw (ConversionException); + TypeCode * type); virtual InputPort* adaptNeutralToPython(InputPort* inport, - TypeCode * type) throw (ConversionException); + TypeCode * type); virtual InputPort* adaptNeutralToCorba(InputPort* inport, - TypeCode * type) throw (ConversionException); + TypeCode * type); virtual InputPort* adaptNeutralToCpp(InputPort* inport, - TypeCode * type) throw (ConversionException); + TypeCode * type); virtual void* convertNeutral(TypeCode * type, Any *data); virtual std::string convertNeutralAsString(TypeCode * type, Any *data); diff --git a/src/runtime/SalomeContainer.cxx b/src/runtime/SalomeContainer.cxx index 0541d481b..19714c9bf 100644 --- a/src/runtime/SalomeContainer.cxx +++ b/src/runtime/SalomeContainer.cxx @@ -112,7 +112,7 @@ Container *SalomeContainer::cloneAlways() const return new SalomeContainer(*this); } -void SalomeContainer::checkCapabilityToDealWith(const ComponentInstance *inst) const throw(YACS::Exception) +void SalomeContainer::checkCapabilityToDealWith(const ComponentInstance *inst) const { if(inst->getKind()!=SalomeComponent::KIND) throw Exception("SalomeContainer::checkCapabilityToDealWith : SalomeContainer is not able to deal with this type of ComponentInstance."); @@ -221,7 +221,7 @@ Engines::Container_ptr SalomeContainer::getContainerPtr(const Task *askingNode) /*! * \param inst the component instance */ -void SalomeContainer::start(const Task *askingNode) throw(YACS::Exception) +void SalomeContainer::start(const Task *askingNode) { SalomeContainerTools::Start(_componentNames,_launchModeType,_sct,_shutdownLevel,this,askingNode); } diff --git a/src/runtime/SalomeContainer.hxx b/src/runtime/SalomeContainer.hxx index dc33ef2fd..66814aa5d 100644 --- a/src/runtime/SalomeContainer.hxx +++ b/src/runtime/SalomeContainer.hxx @@ -51,12 +51,12 @@ namespace YACS std::string getKind() const; bool isAlreadyStarted(const Task *askingNode) const; Engines::Container_ptr getContainerPtr(const Task *askingNode) const; - void start(const Task *askingNode) throw (Exception); + void start(const Task *askingNode) ; Container *clone() const; Container *cloneAlways() const; std::string getPlacementId(const Task *askingNode) const; std::string getFullPlacementId(const Task *askingNode) const; - void checkCapabilityToDealWith(const ComponentInstance *inst) const throw (Exception); + void checkCapabilityToDealWith(const ComponentInstance *inst) const ; void setProperty(const std::string& name, const std::string& value); std::string getProperty(const std::string& name) const; void clearProperties(); diff --git a/src/runtime/SalomeHPContainer.cxx b/src/runtime/SalomeHPContainer.cxx index aac34132f..53064f736 100644 --- a/src/runtime/SalomeHPContainer.cxx +++ b/src/runtime/SalomeHPContainer.cxx @@ -111,7 +111,7 @@ bool SalomeHPContainer::isAlreadyStarted(const Task *askingNode) const return helper->isAlreadyStarted(askingNode); } -void SalomeHPContainer::start(const Task *askingNode) throw(YACS::Exception) +void SalomeHPContainer::start(const Task *askingNode) { SalomeContainerMonoHelper *helper(_launchModeType.getHelperOfTaskThreadSafe(this,askingNode)); SalomeContainerToolsDecorator sctDeco(&_sct,this->getPG(),&_launchModeType,askingNode,this->getNumberOfCoresPerWorker()); @@ -228,7 +228,7 @@ std::map SalomeHPContainer::getResourceProperties(const return _sct.getResourceProperties(name); } -void SalomeHPContainer::checkCapabilityToDealWith(const ComponentInstance *inst) const throw(YACS::Exception) +void SalomeHPContainer::checkCapabilityToDealWith(const ComponentInstance *inst) const { if(inst->getKind()!=SalomeHPComponent::KIND) throw Exception("SalomeHPContainer::checkCapabilityToDealWith : SalomeContainer is not able to deal with this type of ComponentInstance."); diff --git a/src/runtime/SalomeHPContainer.hxx b/src/runtime/SalomeHPContainer.hxx index 0a2ba370b..3c21d3ef2 100644 --- a/src/runtime/SalomeHPContainer.hxx +++ b/src/runtime/SalomeHPContainer.hxx @@ -61,7 +61,7 @@ namespace YACS std::string getKind() const; std::string getDiscreminantStrOfThis(const Task *askingNode) const; bool isAlreadyStarted(const Task *askingNode) const; - void start(const Task *askingNode) throw(Exception); + void start(const Task *askingNode) ; void shutdown(int level); std::string getPlacementId(const Task *askingNode) const; std::string getFullPlacementId(const Task *askingNode) const; @@ -73,7 +73,7 @@ namespace YACS void addComponentName(const std::string& name); std::map getProperties() const; std::map getResourceProperties(const std::string& name) const; - void checkCapabilityToDealWith(const ComponentInstance *inst) const throw(YACS::Exception); + void checkCapabilityToDealWith(const ComponentInstance *inst) const ; std::vector getKernelContainerNames() const; int getNumberOfCoresPerWorker() const; // diff --git a/src/runtime/StudyNodes.cxx b/src/runtime/StudyNodes.cxx index 0898bc7ee..999767087 100644 --- a/src/runtime/StudyNodes.cxx +++ b/src/runtime/StudyNodes.cxx @@ -94,7 +94,7 @@ void StudyInNode::execute() DEBTRACE("+++++++ end StudyInNode::execute +++++++++++" ); } -void StudyInNode::checkBasicConsistency() const throw(YACS::Exception) +void StudyInNode::checkBasicConsistency() const { DEBTRACE("StudyInNode::checkBasicConsistency"); if (! _setOfInputPort.empty()) @@ -231,7 +231,7 @@ void StudyOutNode::execute() DEBTRACE("+++++++ end StudyOutNode::execute +++++++++++" ); } -void StudyOutNode::checkBasicConsistency() const throw(YACS::Exception) +void StudyOutNode::checkBasicConsistency() const { DEBTRACE("StudyOutNode::checkBasicConsistency"); if (! _setOfOutputPort.empty()) diff --git a/src/runtime/StudyNodes.hxx b/src/runtime/StudyNodes.hxx index 0cb011ce2..2e12e4050 100644 --- a/src/runtime/StudyNodes.hxx +++ b/src/runtime/StudyNodes.hxx @@ -36,7 +36,7 @@ namespace YACS StudyInNode(const StudyInNode& other, ComposedNode *father); virtual void execute(); virtual void accept(Visitor *visitor); - virtual void checkBasicConsistency() const throw(Exception); + virtual void checkBasicConsistency() const ; virtual void setData(OutputPort* port, const std::string& data); virtual OutputPort *createOutputPort(const std::string& outputPortName, TypeCode* type); virtual std::string typeName() {return "YACS__ENGINE__StudyInNode";} @@ -52,7 +52,7 @@ namespace YACS StudyOutNode(const StudyOutNode& other, ComposedNode *father); virtual void execute(); virtual void accept(Visitor *visitor); - virtual void checkBasicConsistency() const throw(Exception); + virtual void checkBasicConsistency() const ; virtual void setData(InputPort* port, const std::string& data); virtual InputPort *createInputPort(const std::string& inputPortName, TypeCode* type); virtual std::string typeName() {return "YACS__ENGINE__StudyOutNode";} diff --git a/src/runtime/Test/echoSrv.cxx b/src/runtime/Test/echoSrv.cxx index 80417a72f..8bc9323c4 100644 --- a/src/runtime/Test/echoSrv.cxx +++ b/src/runtime/Test/echoSrv.cxx @@ -85,7 +85,7 @@ public: inline Echo_i() {} virtual ~Echo_i() {} virtual char* echoString(const char* mesg); - CORBA::Long echoLong(CORBA::Long i) throw(eo::SALOME_Exception); + CORBA::Long echoLong(CORBA::Long i); void echoDouble(CORBA::Double i,CORBA::Double& j) ; void echoDoubleVec(const eo::DoubleVec& i,eo::DoubleVec_out j) ; void echoDoubleVecVec(const eo::DoubleVecVec&, eo::DoubleVecVec_out); @@ -213,7 +213,7 @@ void Echo_i::echoDoubleVecVec(const eo::DoubleVecVec& in, eo::DoubleVecVec_out o out=new eo::DoubleVecVec(in); } -CORBA::Long Echo_i::echoLong(CORBA::Long i ) throw(eo::SALOME_Exception) +CORBA::Long Echo_i::echoLong(CORBA::Long i ) { DEBTRACE("Echo_i::echoLong " << i); if(i < 0) { diff --git a/src/runtime/Test/runtimeTest.cxx b/src/runtime/Test/runtimeTest.cxx index 115763f6f..4e4e0346b 100644 --- a/src/runtime/Test/runtimeTest.cxx +++ b/src/runtime/Test/runtimeTest.cxx @@ -1495,7 +1495,7 @@ void RuntimeTest::convertPorts() } } -void myTestRun(int nIn, int nOut, Any **In, Any **Out) throw (YACS::Exception) +void myTestRun(int nIn, int nOut, Any **In, Any **Out) { double x, y; cerr << "myTestRun nIn = " << nIn << endl; diff --git a/src/runtime/XMLCORBAConv.cxx b/src/runtime/XMLCORBAConv.cxx index 1e00a8f5c..d11276bc6 100644 --- a/src/runtime/XMLCORBAConv.cxx +++ b/src/runtime/XMLCORBAConv.cxx @@ -38,7 +38,7 @@ XmlCorba::XmlCorba(InputCorbaPort* p) { } -void XmlCorba::put(const void *data) throw(ConversionException) +void XmlCorba::put(const void *data) { DEBTRACE((const char *)data); put((const char *)data); @@ -48,7 +48,7 @@ void XmlCorba::put(const void *data) throw(ConversionException) /*! * \param data : Xml::char * */ -void XmlCorba::put(const char *data) throw(ConversionException) +void XmlCorba::put(const char *data) { DEBTRACE(data); xmlDocPtr doc; diff --git a/src/runtime/XMLCORBAConv.hxx b/src/runtime/XMLCORBAConv.hxx index 834e032a7..cfe4033ca 100644 --- a/src/runtime/XMLCORBAConv.hxx +++ b/src/runtime/XMLCORBAConv.hxx @@ -34,8 +34,8 @@ namespace YACS { public: XmlCorba(InputCorbaPort* p); - virtual void put(const void *data) throw(ConversionException); - void put(const char *data) throw(ConversionException); + virtual void put(const void *data) ; + void put(const char *data); }; } } diff --git a/src/runtime/XMLCppConv.cxx b/src/runtime/XMLCppConv.cxx index e831f4928..1211c6b1d 100644 --- a/src/runtime/XMLCppConv.cxx +++ b/src/runtime/XMLCppConv.cxx @@ -45,7 +45,7 @@ namespace YACS { } - void XmlCpp::put(const void *data) throw(ConversionException) + void XmlCpp::put(const void *data) { DEBTRACE(" XmlCpp::put(const void *data)"); put((const char *)data); @@ -56,7 +56,7 @@ namespace YACS * \param data : Xml::char * */ - void XmlCpp::put(const char *data) throw(ConversionException) + void XmlCpp::put(const char *data) { DEBTRACE("XmlCpp::put " << data); xmlDocPtr doc; diff --git a/src/runtime/XMLCppConv.hxx b/src/runtime/XMLCppConv.hxx index 9129b5eef..632d0802e 100644 --- a/src/runtime/XMLCppConv.hxx +++ b/src/runtime/XMLCppConv.hxx @@ -32,8 +32,8 @@ namespace YACS { public: XmlCpp(InputPort* p); - virtual void put(const void *data) throw(ConversionException); - void put(const char *data) throw(ConversionException); + virtual void put(const void *data) ; + void put(const char *data); }; int isAdaptableCppXml(const TypeCode *t1, const TypeCode *t2); } diff --git a/src/runtime/XMLNeutralConv.cxx b/src/runtime/XMLNeutralConv.cxx index afff99d4b..4a5f4aac5 100644 --- a/src/runtime/XMLNeutralConv.cxx +++ b/src/runtime/XMLNeutralConv.cxx @@ -36,7 +36,7 @@ XmlNeutral::XmlNeutral(InputPort* p) { } -void XmlNeutral::put(const void *data) throw(ConversionException) +void XmlNeutral::put(const void *data) { DEBTRACE(" XmlNeutral::put(const void *data)"); put((const char *)data); @@ -47,7 +47,7 @@ void XmlNeutral::put(const void *data) throw(ConversionException) * \param data : Xml::char * */ -void XmlNeutral::put(const char *data) throw(ConversionException) +void XmlNeutral::put(const char *data) { DEBTRACE("XmlNeutral::put " << data); xmlDocPtr doc; diff --git a/src/runtime/XMLNeutralConv.hxx b/src/runtime/XMLNeutralConv.hxx index 265597742..a57afe248 100644 --- a/src/runtime/XMLNeutralConv.hxx +++ b/src/runtime/XMLNeutralConv.hxx @@ -32,8 +32,8 @@ namespace YACS { public: XmlNeutral(InputPort* p); - virtual void put(const void *data) throw(ConversionException); - void put(const char *data) throw(ConversionException); + virtual void put(const void *data) ; + void put(const char *data); }; } } diff --git a/src/runtime/XMLPorts.cxx b/src/runtime/XMLPorts.cxx index 606f07d61..306410c4a 100644 --- a/src/runtime/XMLPorts.cxx +++ b/src/runtime/XMLPorts.cxx @@ -53,18 +53,18 @@ const char *InputXmlPort::getXml() const return _data.c_str(); } -void *InputXmlPort::get() const throw(YACS::Exception) +void *InputXmlPort::get() const { return (void *) _data.c_str(); } -void InputXmlPort::put(const void *data) throw (ConversionException) +void InputXmlPort::put(const void *data) { DEBTRACE("put(void *)"); put((const char*)data); } -void InputXmlPort::put(const char *data) throw (ConversionException) +void InputXmlPort::put(const char *data) { DEBTRACE(data); _data = data; @@ -129,17 +129,17 @@ OutputXmlPort::OutputXmlPort(const OutputXmlPort& other, Node *newHelder):Output { } -const char * OutputXmlPort::get() const throw (ConversionException) +const char * OutputXmlPort::get() const { return _data.c_str(); } -void OutputXmlPort::put(const void *data) throw (ConversionException) +void OutputXmlPort::put(const void *data) { put((const char*)data); } -void OutputXmlPort::put(const char *data) throw (ConversionException) +void OutputXmlPort::put(const char *data) { DEBTRACE(data); InputPort *p; diff --git a/src/runtime/XMLPorts.hxx b/src/runtime/XMLPorts.hxx index 61836d3c9..29ba66277 100644 --- a/src/runtime/XMLPorts.hxx +++ b/src/runtime/XMLPorts.hxx @@ -41,12 +41,12 @@ namespace YACS InputXmlPort(const InputXmlPort& other, Node *newHelder); bool edIsManuallyInitialized() const; void edRemoveManInit(); - virtual void put(const void *data) throw (ConversionException); - void put(const char *data) throw (ConversionException); + virtual void put(const void *data); + void put(const char *data); void releaseData() override; InputPort *clone(Node *newHelder) const; virtual const char * getXml() const; - void *get() const throw(Exception); + void *get() const ; bool isEmpty(); virtual void exSaveInit(); virtual void exRestoreInit(); @@ -69,9 +69,9 @@ namespace YACS public: OutputXmlPort(const std::string& name, Node* node, TypeCode * type); OutputXmlPort(const OutputXmlPort& other, Node *newHelder); - virtual void put(const void *data) throw (ConversionException); - void put(const char *data) throw (ConversionException); - virtual const char * get() const throw (ConversionException); + virtual void put(const void *data); + void put(const char *data); + virtual const char * get() const; OutputPort *clone(Node *newHelder) const; virtual std::string dump(); virtual std::string valToStr(); diff --git a/src/runtime/XMLPythonConv.cxx b/src/runtime/XMLPythonConv.cxx index 97701beed..c9aa3cc13 100644 --- a/src/runtime/XMLPythonConv.cxx +++ b/src/runtime/XMLPythonConv.cxx @@ -35,7 +35,7 @@ XmlPython::XmlPython(InputPyPort* p) { } -void XmlPython::put(const void *data) throw(ConversionException) +void XmlPython::put(const void *data) { DEBTRACE((const char *)data); put((const char *)data); @@ -46,7 +46,7 @@ void XmlPython::put(const void *data) throw(ConversionException) * \param data : Xml::char * */ -void XmlPython::put(const char *data) throw(ConversionException) +void XmlPython::put(const char *data) { DEBTRACE(data); xmlDocPtr doc; diff --git a/src/runtime/XMLPythonConv.hxx b/src/runtime/XMLPythonConv.hxx index 55c29505f..983d291dd 100644 --- a/src/runtime/XMLPythonConv.hxx +++ b/src/runtime/XMLPythonConv.hxx @@ -32,8 +32,8 @@ namespace YACS { public: XmlPython(InputPyPort* p); - virtual void put(const void *data) throw(ConversionException); - void put(const char *data) throw(ConversionException); + virtual void put(const void *data) ; + void put(const char *data); }; } } diff --git a/src/yacsloader/Test/OptimizerAlgASyncExample.cxx b/src/yacsloader/Test/OptimizerAlgASyncExample.cxx index 77e7d7fd1..1f1f417a4 100644 --- a/src/yacsloader/Test/OptimizerAlgASyncExample.cxx +++ b/src/yacsloader/Test/OptimizerAlgASyncExample.cxx @@ -44,7 +44,7 @@ class OptimizerAlgASyncExample : public YACS::ENGINE::OptimizerAlgASync virtual YACS::ENGINE::TypeCode *getTCForAlgoInit() const; //! returns typecode of type expected as algo result. OwnerShip of returned pointer is held by this. virtual YACS::ENGINE::TypeCode *getTCForAlgoResult() const; - virtual void initialize(const YACS::ENGINE::Any *input) throw (YACS::Exception); + virtual void initialize(const YACS::ENGINE::Any *input); virtual void startToTakeDecision(); virtual void finish();//! Called when optimization has succeed. virtual YACS::ENGINE::Any * getAlgoResult(); @@ -93,7 +93,7 @@ YACS::ENGINE::TypeCode * OptimizerAlgASyncExample::getTCForAlgoResult() const * future to initialize an algorithm with custom data. */ void OptimizerAlgASyncExample::initialize(const YACS::ENGINE::Any *input) - throw (YACS::Exception) + { std::cout << "Algo initialize, input = " << input->getIntValue() << std::endl; } diff --git a/src/yacsloader/Test/OptimizerAlgSyncExample.cxx b/src/yacsloader/Test/OptimizerAlgSyncExample.cxx index 610c026db..6f748669f 100644 --- a/src/yacsloader/Test/OptimizerAlgSyncExample.cxx +++ b/src/yacsloader/Test/OptimizerAlgSyncExample.cxx @@ -48,7 +48,7 @@ class OptimizerAlgSyncExample : public YACS::ENGINE::OptimizerAlgSync virtual YACS::ENGINE::TypeCode *getTCForAlgoInit() const; //! returns typecode of type expected as algo result. OwnerShip of returned pointer is held by this. virtual YACS::ENGINE::TypeCode *getTCForAlgoResult() const; - virtual void initialize(const YACS::ENGINE::Any *input) throw (YACS::Exception); + virtual void initialize(const YACS::ENGINE::Any *input); virtual void start(); //! Update _pool attribute before performing anything. virtual void takeDecision();//! _pool->getCurrentId gives the \b id at the origin of this call. //! Perform the job of analysing to know what new jobs to do (_pool->pushInSample) @@ -100,7 +100,7 @@ YACS::ENGINE::TypeCode * OptimizerAlgSyncExample::getTCForAlgoResult() const * future to initialize an algorithm with custom data. */ void OptimizerAlgSyncExample::initialize(const YACS::ENGINE::Any *input) - throw (YACS::Exception) + { std::cout << "Algo initialize, input = " << input->getIntValue() << std::endl; } diff --git a/src/yacsloader/Test/echoSrv.cxx b/src/yacsloader/Test/echoSrv.cxx index ca4f61724..708578b93 100644 --- a/src/yacsloader/Test/echoSrv.cxx +++ b/src/yacsloader/Test/echoSrv.cxx @@ -95,7 +95,7 @@ public: virtual ~Echo_i() {} virtual char* echoString(const char* mesg); virtual CORBA::Boolean echoBoolean(CORBA::Boolean b); - CORBA::Long echoLong(CORBA::Long i) throw(eo::SALOME_Exception); + CORBA::Long echoLong(CORBA::Long i); void echoDouble(CORBA::Double i,CORBA::Double& j) ; void echoDoubleVec(const eo::DoubleVec& i,eo::DoubleVec_out j) ; void echoDoubleVecVec(const eo::DoubleVecVec&, eo::DoubleVecVec_out); @@ -229,7 +229,7 @@ void Echo_i::echoDoubleVecVec(const eo::DoubleVecVec& in, eo::DoubleVecVec_out o out=new eo::DoubleVecVec(in); } -CORBA::Long Echo_i::echoLong(CORBA::Long i ) throw(eo::SALOME_Exception) +CORBA::Long Echo_i::echoLong(CORBA::Long i ) { DEBTRACE("Echo_i::echoLong " << i); if(i < 0) { diff --git a/src/yacsloader/loopParsers.hxx b/src/yacsloader/loopParsers.hxx index 2c4c7970c..d9aa89c81 100644 --- a/src/yacsloader/loopParsers.hxx +++ b/src/yacsloader/loopParsers.hxx @@ -394,8 +394,8 @@ public: ENGINE::Node * getNode() { return _node; } // Those two methods should never be called - bool edAddLink(ENGINE::OutPort *start, ENGINE::InPort *end) throw(Exception) { YASSERT(false); } - bool edAddDFLink(ENGINE::OutPort *start, ENGINE::InPort *end) throw(Exception) { YASSERT(false); } + bool edAddLink(ENGINE::OutPort *start, ENGINE::InPort *end) { YASSERT(false); } + bool edAddDFLink(ENGINE::OutPort *start, ENGINE::InPort *end) { YASSERT(false); } protected: ENGINE::Node * _node; -- 2.30.2