X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=include%2Fanna%2Fdiameter%2Fcodec%2Fbasetypes%2FAddress.hpp;h=b6e7fb6af7a48f6a90e06a799d24038a1582d650;hb=5a6cba5fde2b2f538a7515f8293cc0a8d9589dfa;hp=edf72d6ae7f560d9252150f4bfec8c843d2bbbac;hpb=39033fd99e58e994a5e98c1060dcc79e0d81f9c9;p=anna.git

diff --git a/include/anna/diameter/codec/basetypes/Address.hpp b/include/anna/diameter/codec/basetypes/Address.hpp
index edf72d6..b6e7fb6 100644
--- a/include/anna/diameter/codec/basetypes/Address.hpp
+++ b/include/anna/diameter/codec/basetypes/Address.hpp
@@ -1,37 +1,9 @@
-// ANNA - Anna is Not Nothingness Anymore
-//
-// (c) Copyright 2005-2014 Eduardo Ramos Testillano & Francisco Ruiz Rayo
-//
-// http://redmine.teslayout.com/projects/anna-suite
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     *  Neither the name of the copyright holder nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-// Authors: eduardo.ramos.testillano@gmail.com
-//          cisco.tierra@gmail.com
+// ANNA - Anna is Not Nothingness Anymore                                                         //
+//                                                                                                //
+// (c) Copyright 2005-2015 Eduardo Ramos Testillano & Francisco Ruiz Rayo                         //
+//                                                                                                //
+// See project site at http://redmine.teslayout.com/projects/anna-suite                           //
+// See accompanying file LICENSE or copy at http://www.teslayout.com/projects/public/anna.LICENSE //
 
 
 #ifndef anna_diameter_codec_basetypes_Address_hpp
@@ -99,9 +71,9 @@ class Address : OctetString {
 
 
   // Only for derived diameter type:
-  void updateBasic() throw(anna::RuntimeException);
+  void updateBasic() noexcept(false);
 
-  void setPrintableString(const char * printableString) throw(anna::RuntimeException);
+  void setPrintableString(const char * printableString) noexcept(false);
 
 
 public:
@@ -111,12 +83,17 @@ public:
   */
   Address() : a_abbreviatePresentation(true) {};
 
+  /**
+  * Destructor
+  */
+  virtual ~Address() {;}
+ 
   /**
   * Presentation mode: abbreviate (i.e. two standard rules applied for IPv6) or expanded (i.e. groups of zeroes on IP address)
   *
   * @param abb Abbreviate mode boolean indicator
   */
-  void setAbbreviatePresentation(bool abb) throw() { a_abbreviatePresentation = abb; };
+  void setAbbreviatePresentation(bool abb) { a_abbreviatePresentation = abb; };
 
 
 
@@ -127,21 +104,21 @@ public:
   *
   * @return IANA address
   */
-  const iana_address_t& getIANAAddress() const throw() { return a_address; }
+  const iana_address_t& getIANAAddress() const { return a_address; }
 
   /**
   * Sets the IANA address
   *
   * @param address IANA address
   */
-  void setIANAAddress(const iana_address_t& address) throw(anna::RuntimeException) { a_address = address; updateBasic(); }
+  void setIANAAddress(const iana_address_t& address) noexcept(false) { a_address = address; updateBasic(); }
   //
   //////////////////////////////////////////////////////////////////////////////////////////////////////
 
 
   // gets
 
-  std::string getFormatName() const throw() { return "Address"; }
+  std::string getFormatName() const { return "Address"; }
 
 
   // helpers
@@ -152,15 +129,15 @@ public:
   *
   * @return Natural/smart string representation for IANA address (only IPv4 and IPv6 are printable-supported)
   */
-  std::string asPrintableString() throw(anna::RuntimeException);
+  std::string asPrintableString() noexcept(false);
 
 
-  std::string asString() throw(anna::RuntimeException) { return a_address.asString(); }
+  std::string asString() noexcept(false) { return a_address.asString(); }
 
 
   // sets
 
-  void decode(const char* buffer, const int size) throw(anna::RuntimeException);
+  void decode(const char* buffer, const int size) noexcept(false);
 
 
   // exports /////////////////////////////