X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=include%2Fanna%2Fdiameter%2Fstack%2FVendor.hpp;h=4267a39a31dbb54629de028efdd600a9f9f4ff81;hb=5a6cba5fde2b2f538a7515f8293cc0a8d9589dfa;hp=1869e30618e5eaf18a081f08e739410ff419ceeb;hpb=39033fd99e58e994a5e98c1060dcc79e0d81f9c9;p=anna.git diff --git a/include/anna/diameter/stack/Vendor.hpp b/include/anna/diameter/stack/Vendor.hpp index 1869e30..4267a39 100644 --- a/include/anna/diameter/stack/Vendor.hpp +++ b/include/anna/diameter/stack/Vendor.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_stack_Vendor_hpp @@ -95,7 +67,7 @@ public: * @param v Vendor code * @return Vendor name */ - static const char* asText(const Code::_v v) throw(anna::RuntimeException) { + static const char* asText(const Code::_v v) noexcept(false) { return asCString(v); } }; @@ -106,27 +78,27 @@ public: // get - S32 getId(void) const throw() { return a_id; } - const S8 * getName(void) const throw() { return a_name.c_str(); } + S32 getId(void) const { return a_id; } + const S8 * getName(void) const { return a_name.c_str(); } // helpers - bool isVendorSpecific(void) const throw() { return (a_id > 0); } + bool isVendorSpecific(void) const { return (a_id > 0); } - std::string asString(void) const throw(); - anna::xml::Node* asXML(anna::xml::Node* parent) const throw(); + std::string asString(void) const ; + anna::xml::Node* asXML(anna::xml::Node* parent) const ; // operators friend bool operator == (const Vendor & v1, const Vendor & v2) { return ((v1.getId() == v2.getId())); } // set - void setId(const S32 & id) throw(anna::RuntimeException) { + void setId(const S32 & id) noexcept(false) { if(id < 0) throw anna::RuntimeException("Negative vendor-id not allowed", ANNA_FILE_LOCATION); a_id = id; } - void setName(const std::string & n) throw(anna::RuntimeException) { + void setName(const std::string & n) noexcept(false) { if(n == "") throw anna::RuntimeException("Empty vendor-name string not allowed", ANNA_FILE_LOCATION); a_name = n;