X-Git-Url: https://git.teslayout.com/public/public/public/?p=anna.git;a=blobdiff_plain;f=include%2Fanna%2Fdiameter%2Fstack%2FDictionary.hpp;fp=include%2Fanna%2Fdiameter%2Fstack%2FDictionary.hpp;h=cbb8ee2753788899b740386c876a50f8314923ee;hp=33f8de68641a6770dfb5d83f074e7fa99783783b;hb=5a6cba5fde2b2f538a7515f8293cc0a8d9589dfa;hpb=af9c86ffb0e28d35ad94d99c5f77e41578c972b4

diff --git a/include/anna/diameter/stack/Dictionary.hpp b/include/anna/diameter/stack/Dictionary.hpp
index 33f8de6..cbb8ee2 100644
--- a/include/anna/diameter/stack/Dictionary.hpp
+++ b/include/anna/diameter/stack/Dictionary.hpp
@@ -112,14 +112,14 @@ private:
 
 
   // init
-  void initialize() throw();
+  void initialize() ;
 
   // check & addings
-  //void checkUniqueIdentifiers(const anna::xml::Node *rootNode) const throw(anna::RuntimeException);
-  void extractFormats(const anna::xml::Node *rootNode) throw(anna::RuntimeException);
-  void extractVendors(const anna::xml::Node *rootNode) throw(anna::RuntimeException);
-  void extractAvps(const anna::xml::Node *rootNode) throw(anna::RuntimeException);
-  void extractCommands(const anna::xml::Node *rootNode) throw(anna::RuntimeException);
+  //void checkUniqueIdentifiers(const anna::xml::Node *rootNode) const noexcept(false);
+  void extractFormats(const anna::xml::Node *rootNode) noexcept(false);
+  void extractVendors(const anna::xml::Node *rootNode) noexcept(false);
+  void extractAvps(const anna::xml::Node *rootNode) noexcept(false);
+  void extractCommands(const anna::xml::Node *rootNode) noexcept(false);
 
 public:
 
@@ -127,38 +127,38 @@ public:
   ~Dictionary() {};
 
   // get
-  const std::string & getName() const throw() { return a_name; }
-  const Format * getFormat(const std::string & formatName) const throw();
-  const Vendor * getVendor(S32 vendorId) const throw();
-  const Vendor * getVendor(const std::string & vendorName) const throw();
-  const Avp * getAvp(const AvpId & avpId) const throw();
-  const Avp * getAvp(const std::string & avpName) const throw();
-  const Command * getCommand(const CommandId & commandId) const throw();
-  const Command * getCommand(const std::string & commandName) const throw();
+  const std::string & getName() const { return a_name; }
+  const Format * getFormat(const std::string & formatName) const ;
+  const Vendor * getVendor(S32 vendorId) const ;
+  const Vendor * getVendor(const std::string & vendorName) const ;
+  const Avp * getAvp(const AvpId & avpId) const ;
+  const Avp * getAvp(const std::string & avpName) const ;
+  const Command * getCommand(const CommandId & commandId) const ;
+  const Command * getCommand(const std::string & commandName) const ;
 
   // set
-  void allowUpdates(bool allow = true) throw() { a_allowUpdates = allow; }
-  void addFormat(const Format &, bool reserved = false) throw(anna::RuntimeException);
-  void addVendor(const Vendor &) throw(anna::RuntimeException);
-  void addAvp(const Avp &) throw(anna::RuntimeException);
-  void addCommand(const Command &) throw(anna::RuntimeException);
+  void allowUpdates(bool allow = true) { a_allowUpdates = allow; }
+  void addFormat(const Format &, bool reserved = false) noexcept(false);
+  void addVendor(const Vendor &) noexcept(false);
+  void addAvp(const Avp &) noexcept(false);
+  void addCommand(const Command &) noexcept(false);
 
   // containers
-  const_format_iterator format_begin() const throw() { return a_formats.begin(); }
-  const_format_iterator format_end() const throw() { return a_formats.end(); }
-  int format_size() const throw() { return a_formats.size(); }
+  const_format_iterator format_begin() const { return a_formats.begin(); }
+  const_format_iterator format_end() const { return a_formats.end(); }
+  int format_size() const { return a_formats.size(); }
 
-  const_vendor_iterator vendor_begin() const throw() { return a_vendors.begin(); }
-  const_vendor_iterator vendor_end() const throw() { return a_vendors.end(); }
-  int vendor_size() const throw() { return a_vendors.size(); }
+  const_vendor_iterator vendor_begin() const { return a_vendors.begin(); }
+  const_vendor_iterator vendor_end() const { return a_vendors.end(); }
+  int vendor_size() const { return a_vendors.size(); }
 
-  const_avp_iterator avp_begin() const throw() { return a_avps.begin(); }
-  const_avp_iterator avp_end() const throw() { return a_avps.end(); }
-  int avp_size() const throw() { return a_avps.size(); }
+  const_avp_iterator avp_begin() const { return a_avps.begin(); }
+  const_avp_iterator avp_end() const { return a_avps.end(); }
+  int avp_size() const { return a_avps.size(); }
 
-  const_command_iterator command_begin() const throw() { return a_commands.begin(); }
-  const_command_iterator command_end() const throw() { return a_commands.end(); }
-  int command_size() const throw() { return a_commands.size(); }
+  const_command_iterator command_begin() const { return a_commands.begin(); }
+  const_command_iterator command_end() const { return a_commands.end(); }
+  int command_size() const { return a_commands.size(); }
 
 
   // helpers
@@ -167,20 +167,20 @@ public:
   *
   * @return String with class content
   */
-  std::string asString(void) const throw();
+  std::string asString(void) const ;
 
   /**
      Class XML representation.
      \param parent XML node over which we will put instance information.
      \return XML documentcon with class content.
   */
-  anna::xml::Node* asXML(anna::xml::Node* parent) const throw();
+  anna::xml::Node* asXML(anna::xml::Node* parent) const ;
 
   /**
      Class XML string representation
      \return XML string representation with class content.
   */
-  std::string asXMLString() const throw();
+  std::string asXMLString() const ;
 
   // operators
 
@@ -204,12 +204,12 @@ public:
   * huaweiStack->load("/var/tmp/huawei_commands.xml");
   * </pre>
   */
-  virtual void load(const std::string & pathFile) throw(anna::RuntimeException);
+  virtual void load(const std::string & pathFile) noexcept(false);
 
   /**
   * Clears dictionary content
   */
-  void clear(void) throw() { initialize(); } // initialize and prepares the dictionary
+  void clear(void) { initialize(); } // initialize and prepares the dictionary
 };