X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=source%2Fdiameter%2Fcodec%2Ftme%2FAvp.cpp;h=e5acc021acf2c102b191bcbf17c7d56fe5ea4d9e;hb=5a6cba5fde2b2f538a7515f8293cc0a8d9589dfa;hp=6875c87afbb9415da6757a51b1e7c9e3c6e7f2f5;hpb=e80e62a5cf9aacad1a9551c68c432147ef98cd29;p=anna.git diff --git a/source/diameter/codec/tme/Avp.cpp b/source/diameter/codec/tme/Avp.cpp index 6875c87..e5acc02 100644 --- a/source/diameter/codec/tme/Avp.cpp +++ b/source/diameter/codec/tme/Avp.cpp @@ -20,22 +20,6 @@ using namespace anna; using namespace anna::diameter::codec::tme; - -////------------------------------------------------------------------------------ -////------------------------------------------------------------------- Avp::Avp() -////------------------------------------------------------------------------------ -//Avp::Avp(Engine *engine) : anna::diameter::codec::Avp(engine) { -// initialize(); -//} -// -////------------------------------------------------------------------------------ -////------------------------------------------------------------------- Avp::Avp() -////------------------------------------------------------------------------------ -//Avp::Avp(AvpId id, Engine *engine)/* : anna::diameter::codec::Avp(id, engine)*/ { -// initialize(); -// setId(id); -//} - //------------------------------------------------------------------------------ //------------------------------------------------------------------ Avp::~Avp() //------------------------------------------------------------------------------ @@ -47,7 +31,7 @@ Avp::~Avp() { ////------------------------------------------------------------------------------ ////------------------------------------------------------------- Avp::getEngine() ////------------------------------------------------------------------------------ -//anna::diameter::codec::Engine * Avp::getEngine() const throw(anna::RuntimeException) { +//anna::diameter::codec::Engine * Avp::getEngine() const noexcept(false) { // if(!a_engine) // throw anna::RuntimeException("Invalid codec engine reference (NULL)", ANNA_FILE_LOCATION); // @@ -58,7 +42,7 @@ Avp::~Avp() { //------------------------------------------------------------------------------ //---------------------------------------------------- Avp::initializeByFormat() //------------------------------------------------------------------------------ -void Avp::initializeByFormat() throw() { +void Avp::initializeByFormat() { a_ISDNNumber = NULL; a_ISDNAddress = NULL; a_Unsigned16 = NULL; @@ -68,7 +52,7 @@ void Avp::initializeByFormat() throw() { //------------------------------------------------------------------------------ //--------------------------------------------------------- Avp::clearByFormat() //------------------------------------------------------------------------------ -void Avp::clearByFormat() throw() { +void Avp::clearByFormat() { delete a_ISDNNumber; delete a_ISDNAddress; delete a_Unsigned16; @@ -78,7 +62,7 @@ void Avp::clearByFormat() throw() { //------------------------------------------------------------------------------ //---------------------------------------------------- Avp::allocationByFormat() //------------------------------------------------------------------------------ -void Avp::allocationByFormat(const stack::Format *stackFormat) throw() { +void Avp::allocationByFormat(const stack::Format *stackFormat) { if(stackFormat->getName() == "ISDNNumber") a_ISDNNumber = new ISDNNumber(); else if(stackFormat->getName() == "ISDNAddress") a_ISDNAddress = new ISDNAddress(); else if(stackFormat->getName() == "Unsigned16") a_Unsigned16 = new Unsigned16(); @@ -88,7 +72,7 @@ void Avp::allocationByFormat(const stack::Format *stackFormat) throw() { //------------------------------------------------------------------------------ //----------------------------------------------------- Avp::getLengthByFormat() //------------------------------------------------------------------------------ -U24 Avp::getLengthByFormat(const stack::Format *stackFormat) const throw() { +U24 Avp::getLengthByFormat(const stack::Format *stackFormat) const { U24 result = 0; if(stackFormat->getName() == "ISDNNumber") result += a_ISDNNumber->getSize(); @@ -102,7 +86,7 @@ U24 Avp::getLengthByFormat(const stack::Format *stackFormat) const throw() { //------------------------------------------------------------------------------ //------------------------------------------------ Avp::decodeDataPartByFormat() //------------------------------------------------------------------------------ -void Avp::decodeDataPartByFormat(const char * buffer, int size, const stack::Format *stackFormat) throw(anna::RuntimeException) { +void Avp::decodeDataPartByFormat(const char * buffer, int size, const stack::Format *stackFormat) noexcept(false) { if(stackFormat->getName() == "ISDNNumber") a_ISDNNumber->decode(buffer, size); else if(stackFormat->getName() == "ISDNAddress") a_ISDNAddress->decode(buffer, size); else if(stackFormat->getName() == "Unsigned16") a_Unsigned16->decode(buffer, size); @@ -112,7 +96,7 @@ void Avp::decodeDataPartByFormat(const char * buffer, int size, const stack::For //------------------------------------------------------------------------------ //---------------------------------------------------------- Avp::codeByFormat() //------------------------------------------------------------------------------ -void Avp::codeByFormat(char* dataPart, const stack::Format *stackFormat) const throw(anna::RuntimeException) { +void Avp::codeByFormat(char* dataPart, const stack::Format *stackFormat) const noexcept(false) { int dataBytes; if(stackFormat->getName() == "ISDNNumber") a_ISDNNumber->code(dataPart, dataBytes); @@ -124,7 +108,7 @@ void Avp::codeByFormat(char* dataPart, const stack::Format *stackFormat) const t //------------------------------------------------------------------------------ //---------------------------------------------------- Avp::getXMLdataByFormat() //------------------------------------------------------------------------------ -std::string Avp::getXMLdataByFormat(bool & isHex, const stack::Format *stackFormat) const throw() { +std::string Avp::getXMLdataByFormat(bool & isHex, const stack::Format *stackFormat) const { std::string result; if(stackFormat->getName() == "ISDNNumber") { @@ -142,7 +126,7 @@ std::string Avp::getXMLdataByFormat(bool & isHex, const stack::Format *stackForm //------------------------------------------------------------------------------ //------------------------------------------------------- Avp::fromXMLByFormat() //------------------------------------------------------------------------------ -void Avp::fromXMLByFormat(const anna::xml::Attribute* data, const anna::xml::Attribute* hexData, const stack::Format *stackFormat) throw(anna::RuntimeException) { +void Avp::fromXMLByFormat(const anna::xml::Attribute* data, const anna::xml::Attribute* hexData, const stack::Format *stackFormat) noexcept(false) { if(stackFormat->getName() == "ISDNNumber") { if(data) a_ISDNNumber->fromPrintableString(data->getValue().c_str()); else if(hexData) a_ISDNNumber->fromHexString(hexData->getValue());