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=a50351671c3c6f7fae324ef06aee797bd5e986ac;hpb=93366a0bda79e6fd6e7dad6316bfcf8cc82f5731;p=anna.git

diff --git a/source/diameter/codec/tme/Avp.cpp b/source/diameter/codec/tme/Avp.cpp
index a503516..e5acc02 100644
--- a/source/diameter/codec/tme/Avp.cpp
+++ b/source/diameter/codec/tme/Avp.cpp
@@ -8,7 +8,7 @@
 
 // Local
 #include <anna/diameter/codec/tme/Avp.hpp>
-#include <anna/diameter/codec/tme/Engine.hpp>
+//#include <anna/diameter/codec/tme/Engine.hpp>
 
 #include <anna/diameter/helpers/defines.hpp>
 #include <anna/diameter/stack/Format.hpp>
@@ -20,24 +20,6 @@ using namespace anna;
 using namespace anna::diameter::codec::tme;
 
 
-
-//------------------------------------------------------------------------------
-//------------------------------------------------------------------- Avp::Avp()
-//------------------------------------------------------------------------------
-Avp::Avp() {
-  initialize();
-}
-
-
-//------------------------------------------------------------------------------
-//------------------------------------------------------------------- Avp::Avp()
-//------------------------------------------------------------------------------
-Avp::Avp(AvpId id) {
-  initialize();
-  setId(id);
-}
-
-
 //------------------------------------------------------------------------------
 //------------------------------------------------------------------ Avp::~Avp()
 //------------------------------------------------------------------------------
@@ -46,18 +28,21 @@ Avp::~Avp() {
 }
 
 
-//------------------------------------------------------------------------------
-//------------------------------------------------------------- Avp::getEngine()
-//------------------------------------------------------------------------------
-anna::diameter::codec::Engine * Avp::getEngine() const throw(anna::RuntimeException) {
-  return a_engine ? a_engine : (a_engine = (anna::diameter::codec::Engine *)anna::functions::component <Engine> (ANNA_FILE_LOCATION));
-}
+////------------------------------------------------------------------------------
+////------------------------------------------------------------- Avp::getEngine()
+////------------------------------------------------------------------------------
+//anna::diameter::codec::Engine * Avp::getEngine() const noexcept(false) {
+//  if(!a_engine)
+//    throw anna::RuntimeException("Invalid codec engine reference (NULL)", ANNA_FILE_LOCATION);
+//
+//  return a_engine;
+//}
 
 
 //------------------------------------------------------------------------------
 //---------------------------------------------------- Avp::initializeByFormat()
 //------------------------------------------------------------------------------
-void Avp::initializeByFormat() throw() {
+void Avp::initializeByFormat() {
   a_ISDNNumber = NULL;
   a_ISDNAddress = NULL;
   a_Unsigned16 = NULL;
@@ -67,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;
@@ -77,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();
@@ -87,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();
@@ -101,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);
@@ -111,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);
@@ -123,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") {
@@ -141,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());