Remove dynamic exceptions

[anna.git] / source / diameter / stack / Dictionary.cpp

diff --git a/source/diameter/stack/Dictionary.cpp b/source/diameter/stack/Dictionary.cpp
index 68f37c1..0f7826a 100644 (file)
--- a/source/diameter/stack/Dictionary.cpp
+++ b/source/diameter/stack/Dictionary.cpp
@@ -58,7 +58,7 @@ Dictionary::Dictionary(void) {
 //------------------------------------------------------------------------------
 //----------------------------------------------------- Dictionary::initialize()
 //------------------------------------------------------------------------------
-void Dictionary::initialize() throw() {
+void Dictionary::initialize() {
   a_formats.clear();
   a_vendors.clear();
   a_avps.clear();
@@ -124,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);
@@ -157,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) {
@@ -189,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) {
@@ -220,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) {
@@ -255,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));
@@ -267,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));
@@ -279,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);
@@ -291,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));
@@ -303,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);
@@ -315,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));
@@ -327,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);
@@ -339,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;
@@ -413,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 {
 //   <!ELEMENT dictionary (format*, vendor*, avp*, command*)>
 //   <!ATTLIST dictionary name CDATA #REQUIRED>
   anna::xml::Node* result = parent->createChild("dictionary");
@@ -451,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));
 }
@@ -461,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;
@@ -511,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++) {
@@ -536,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++) {
@@ -559,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;
 
@@ -763,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:
@@ -812,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);