X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;ds=sidebyside;f=source%2Fcomm%2FINetAddress.cpp;h=2a6bd187566ce93394c8515ead09231c97a5a11a;hb=5a6cba5fde2b2f538a7515f8293cc0a8d9589dfa;hp=07843afda04ff49ea7ac59ef74b65f529e471826;hpb=4e12ac57e93c052f716a6305ad8fc099c45899d1;p=anna.git diff --git a/source/comm/INetAddress.cpp b/source/comm/INetAddress.cpp index 07843af..2a6bd18 100644 --- a/source/comm/INetAddress.cpp +++ b/source/comm/INetAddress.cpp @@ -1,37 +1,9 @@ -// ANNA - Anna is Not 'N' Anymore -// -// (c) Copyright 2005-2014 Eduardo Ramos Testillano & Francisco Ruiz Rayo -// -// https://bitbucket.org/testillano/anna -// -// 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 Google Inc. 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 // #include @@ -46,7 +18,7 @@ using namespace std; using namespace anna; const comm::Device* comm::INetAddress::getDevice(const bool exceptionWhenNull) const -throw(RuntimeException) { +noexcept(false) { if(a_device == NULL && exceptionWhenNull == true) { string msg(asString()); msg += " | No device attached"; @@ -57,27 +29,27 @@ throw(RuntimeException) { } string comm::INetAddress::asString() const -throw() { +{ string result("comm::INetAddress { "); result += functions::asString(a_device); return result += anna::functions::asString(" | Port: %d }", a_port); } string comm::INetAddress::serialize() const -throw() { +{ in_addr_t inaddr = (a_device) ? a_device->getAddress() : 0; string result(Device::asString(inaddr)); return result += anna::functions::asString(".%d", a_port); } xml::Node* comm::INetAddress::asXML(xml::Node* parent) const -throw(RuntimeException) { +noexcept(false) { xml::Node* result = parent->createChild("comm.INetAddress"); if(a_device != NULL) a_device->asAttribute(result); else - result->createAttribute("Device", ""); + result->createAttribute("Device", "[null]"); result->createAttribute("Port", a_port); return result;