X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=source%2Fdiameter%2Fstack%2FDictionary.cpp;h=0f7826af1d4b00c754d8578f5dabf7f584af4e49;hb=5a6cba5fde2b2f538a7515f8293cc0a8d9589dfa;hp=b94d46d37bda6fefd7c93cc53540bc250c21a5c9;hpb=24ef34af54c4a42fcbd65a0ef065bddaaf1bd096;p=anna.git diff --git a/source/diameter/stack/Dictionary.cpp b/source/diameter/stack/Dictionary.cpp index b94d46d..0f7826a 100644 --- a/source/diameter/stack/Dictionary.cpp +++ b/source/diameter/stack/Dictionary.cpp @@ -41,8 +41,9 @@ LOGNOTICE(\ trace += "\n";\ anna::Logger::notice(trace, ANNA_FILE_LOCATION);\ );\ +std::string name = found->getName();\ pool.erase(pool.find(found->getId()));\ -poolNames.erase(poolNames.find(found->getName())); +poolNames.erase(poolNames.find(name)); //------------------------------------------------------------------------------ @@ -57,7 +58,7 @@ Dictionary::Dictionary(void) { //------------------------------------------------------------------------------ //----------------------------------------------------- Dictionary::initialize() //------------------------------------------------------------------------------ -void Dictionary::initialize() throw() { +void Dictionary::initialize() { a_formats.clear(); a_vendors.clear(); a_avps.clear(); @@ -123,7 +124,7 @@ void Dictionary::initialize() throw() { //------------------------------------------------------------------------------ //------------------------------------------------------ Dictionary::addFormat() //------------------------------------------------------------------------------ -void Dictionary::addFormat(const Format & format, bool reserved) throw(anna::RuntimeException) { +void Dictionary::addFormat(const Format & format, bool reserved) noexcept(false) { if(!reserved && format.isReserved()) { std::string s_ex = anna::functions::asString("Format type '%s' is reserved for internal use", format.getName().c_str()); throw anna::RuntimeException(s_ex, ANNA_FILE_LOCATION); @@ -156,7 +157,7 @@ void Dictionary::addFormat(const Format & format, bool reserved) throw(anna::Run //------------------------------------------------------------------------------ //------------------------------------------------------ Dictionary::addVendor() //------------------------------------------------------------------------------ -void Dictionary::addVendor(const Vendor & vendor) throw(anna::RuntimeException) { +void Dictionary::addVendor(const Vendor & vendor) noexcept(false) { const Vendor * found = getVendor(vendor.getId()); if(found) { @@ -188,7 +189,7 @@ void Dictionary::addVendor(const Vendor & vendor) throw(anna::RuntimeException) //------------------------------------------------------------------------------ //--------------------------------------------------------- Dictionary::addAvp() //------------------------------------------------------------------------------ -void Dictionary::addAvp(const Avp & avp) throw(anna::RuntimeException) { +void Dictionary::addAvp(const Avp & avp) noexcept(false) { const Avp * found = getAvp(avp.getId()); if (found) { @@ -201,7 +202,7 @@ void Dictionary::addAvp(const Avp & avp) throw(anna::RuntimeException) { ITEM_OVERWRITE("avp", avp, a_avps, a_avpNames); } - if(found = getAvp(avp.getName())) { + if((found = getAvp(avp.getName()))) { if(!a_allowUpdates) { std::string s_ex = "Cannot add an avp with an existing name:\n"; s_ex += avp.asString(); @@ -219,7 +220,7 @@ void Dictionary::addAvp(const Avp & avp) throw(anna::RuntimeException) { //------------------------------------------------------------------------------ //----------------------------------------------------- Dictionary::addCommand() //------------------------------------------------------------------------------ -void Dictionary::addCommand(const Command & command) throw(anna::RuntimeException) { +void Dictionary::addCommand(const Command & command) noexcept(false) { const Command * found = getCommand(command.getId()); if(found) { @@ -254,7 +255,7 @@ void Dictionary::addCommand(const Command & command) throw(anna::RuntimeExceptio //------------------------------------------------------------------------------ //------------------------------------------------------ Dictionary::getFormat() //------------------------------------------------------------------------------ -const Format * Dictionary::getFormat(const std::string & formatName) const throw() { +const Format * Dictionary::getFormat(const std::string & formatName) const { const_format_iterator it = a_formats.find(formatName); if(it != format_end()) return ((const Format *) & ((*it).second)); @@ -266,7 +267,7 @@ const Format * Dictionary::getFormat(const std::string & formatName) const throw //------------------------------------------------------------------------------ //------------------------------------------------------ Dictionary::getVendor() //------------------------------------------------------------------------------ -const Vendor * Dictionary::getVendor(S32 vendorId) const throw() { +const Vendor * Dictionary::getVendor(S32 vendorId) const { const_vendor_iterator it = a_vendors.find(vendorId); if(it != vendor_end()) return ((const Vendor *) & ((*it).second)); @@ -278,7 +279,7 @@ const Vendor * Dictionary::getVendor(S32 vendorId) const throw() { //------------------------------------------------------------------------------ //------------------------------------------------------ Dictionary::getVendor() //------------------------------------------------------------------------------ -const Vendor * Dictionary::getVendor(const std::string & vendorName) const throw() { +const Vendor * Dictionary::getVendor(const std::string & vendorName) const { const_vendorNames_iterator v_it = a_vendorNames.find(vendorName); if(v_it != a_vendorNames.end()) return ((*v_it).second); @@ -290,7 +291,7 @@ const Vendor * Dictionary::getVendor(const std::string & vendorName) const throw //------------------------------------------------------------------------------ //--------------------------------------------------------- Dictionary::getAvp() //------------------------------------------------------------------------------ -const Avp * Dictionary::getAvp(const AvpId & avpId) const throw() { +const Avp * Dictionary::getAvp(const AvpId & avpId) const { const_avp_iterator it = a_avps.find(avpId); if(it != avp_end()) return ((const Avp *) & ((*it).second)); @@ -302,7 +303,7 @@ const Avp * Dictionary::getAvp(const AvpId & avpId) const throw() { //------------------------------------------------------------------------------ //--------------------------------------------------------- Dictionary::getAvp() //------------------------------------------------------------------------------ -const Avp * Dictionary::getAvp(const std::string & avpName) const throw() { +const Avp * Dictionary::getAvp(const std::string & avpName) const { const_avpNames_iterator a_it = a_avpNames.find(avpName); if(a_it != a_avpNames.end()) return ((*a_it).second); @@ -314,7 +315,7 @@ const Avp * Dictionary::getAvp(const std::string & avpName) const throw() { //------------------------------------------------------------------------------ //----------------------------------------------------- Dictionary::getCommand() //------------------------------------------------------------------------------ -const Command * Dictionary::getCommand(const CommandId & commandId) const throw() { +const Command * Dictionary::getCommand(const CommandId & commandId) const { const_command_iterator it = a_commands.find(commandId); if(it != command_end()) return ((const Command *) & ((*it).second)); @@ -326,7 +327,7 @@ const Command * Dictionary::getCommand(const CommandId & commandId) const throw( //------------------------------------------------------------------------------ //----------------------------------------------------- Dictionary::getCommand() //------------------------------------------------------------------------------ -const Command * Dictionary::getCommand(const std::string & commandName) const throw() { +const Command * Dictionary::getCommand(const std::string & commandName) const { const_commandNames_iterator c_it = a_commandNames.find(commandName); if(c_it != a_commandNames.end()) return ((*c_it).second); @@ -338,7 +339,7 @@ const Command * Dictionary::getCommand(const std::string & commandName) const th //------------------------------------------------------------------------------ //------------------------------------------------------- Dictionary::asString() //------------------------------------------------------------------------------ -std::string Dictionary::asString(void) const throw() { +std::string Dictionary::asString(void) const { std::string trace, title; trace += "\n"; anna::functions::TextHighlightMode::_v thm = anna::functions::TextHighlightMode::LeftAndRightline; @@ -412,7 +413,7 @@ std::string Dictionary::asString(void) const throw() { //------------------------------------------------------------------------------ //---------------------------------------------------------- Dictionary::asXML() //------------------------------------------------------------------------------ -anna::xml::Node* Dictionary::asXML(anna::xml::Node* parent) const throw() { +anna::xml::Node* Dictionary::asXML(anna::xml::Node* parent) const { // // anna::xml::Node* result = parent->createChild("dictionary"); @@ -450,7 +451,7 @@ anna::xml::Node* Dictionary::asXML(anna::xml::Node* parent) const throw() { //------------------------------------------------------------------------------ //---------------------------------------------------- Dictionary::asXMLString() //------------------------------------------------------------------------------ -std::string Dictionary::asXMLString() const throw() { +std::string Dictionary::asXMLString() const { anna::xml::Node root("root"); return anna::xml::Compiler().apply(asXML(&root)); } @@ -460,7 +461,7 @@ std::string Dictionary::asXMLString() const throw() { ////------------------------------------------------------------------------------ ////----------------------------------------- Dictionary::checkUniqueIdentifiers() ////------------------------------------------------------------------------------ -//void Dictionary::checkUniqueIdentifiers(const anna::xml::Node *rootNode) const throw(anna::RuntimeException) { +//void Dictionary::checkUniqueIdentifiers(const anna::xml::Node *rootNode) const noexcept(false) { // std::map < std::string/*xml ref*/, int/*dummy*/ > formats; // std::map < std::string/*xml ref*/, int/*dummy*/ > vendors; // std::map < std::string/*xml ref*/, int/*dummy*/ > avps; @@ -510,7 +511,7 @@ std::string Dictionary::asXMLString() const throw() { //------------------------------------------------------------------------------ //------------------------------------------------- Dictionary::extractFormats() //------------------------------------------------------------------------------ -void Dictionary::extractFormats(const anna::xml::Node *rootNode) throw(anna::RuntimeException) { +void Dictionary::extractFormats(const anna::xml::Node *rootNode) noexcept(false) { Format aux; for(anna::xml::Node::const_child_iterator it = rootNode->child_begin(); it != rootNode->child_end(); it++) { @@ -535,7 +536,7 @@ void Dictionary::extractFormats(const anna::xml::Node *rootNode) throw(anna::Run //------------------------------------------------------------------------------ //------------------------------------------------- Dictionary::extractVendors() //------------------------------------------------------------------------------ -void Dictionary::extractVendors(const anna::xml::Node *rootNode) throw(anna::RuntimeException) { +void Dictionary::extractVendors(const anna::xml::Node *rootNode) noexcept(false) { Vendor aux; for(anna::xml::Node::const_child_iterator it = rootNode->child_begin(); it != rootNode->child_end(); it++) { @@ -558,7 +559,7 @@ void Dictionary::extractVendors(const anna::xml::Node *rootNode) throw(anna::Run //------------------------------------------------------------------------------ //---------------------------------------------------- Dictionary::extractAvps() //------------------------------------------------------------------------------ -void Dictionary::extractAvps(const anna::xml::Node *rootNode) throw(anna::RuntimeException) { +void Dictionary::extractAvps(const anna::xml::Node *rootNode) noexcept(false) { Avp auxAvp; const anna::xml::Node *singleNode, *groupedNode; @@ -762,7 +763,7 @@ void Dictionary::extractAvps(const anna::xml::Node *rootNode) throw(anna::Runtim //------------------------------------------------------------------------------ //------------------------------------------------ Dictionary::extractCommands() //------------------------------------------------------------------------------ -void Dictionary::extractCommands(const anna::xml::Node *rootNode) throw(anna::RuntimeException) { +void Dictionary::extractCommands(const anna::xml::Node *rootNode) noexcept(false) { Command auxCommand; // (*) Avp rules adding: @@ -811,7 +812,7 @@ void Dictionary::extractCommands(const anna::xml::Node *rootNode) throw(anna::Ru //------------------------------------------------------------------------------ //----------------------------------------------------------- Dictionary::load() //------------------------------------------------------------------------------ -void Dictionary::load(const std::string & pathFile) throw(anna::RuntimeException) { +void Dictionary::load(const std::string & pathFile) noexcept(false) { if(pathFile == "") throw anna::RuntimeException("Empty xml path file provided", ANNA_FILE_LOCATION);