X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=source%2Fcomm%2FAccessPoint.cpp;h=bf015799ac296df0feaeef91dbc85329b0663e41;hb=f34b8069233e9e09208339bb79d8576c1ff962e1;hp=d18737d4a1195cf5f27f1311f3d2b155d95df7e0;hpb=4e12ac57e93c052f716a6305ad8fc099c45899d1;p=anna.git diff --git a/source/comm/AccessPoint.cpp b/source/comm/AccessPoint.cpp index d18737d..bf01579 100644 --- a/source/comm/AccessPoint.cpp +++ b/source/comm/AccessPoint.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 @@ -47,7 +19,7 @@ using namespace std; using namespace anna; bool comm::AccessPoint::operator == (const comm::AccessPoint& rhs) const -throw() { +{ if(rhs.isNull() && this->isNull()) return true; @@ -61,7 +33,7 @@ throw() { } comm::AccessPoint& comm::AccessPoint::operator = (const INetAddress & inetAddress) -throw() { +{ if(a_path != NULL) { delete a_path; a_path = NULL; @@ -72,7 +44,7 @@ throw() { } comm::AccessPoint& comm::AccessPoint::operator = (const std::string & path) -throw() { +{ if(a_path == &path) return *this; @@ -87,7 +59,7 @@ throw() { } comm::AccessPoint& comm::AccessPoint::operator = (const AccessPoint & rhs) -throw() { +{ if(this == &rhs) return *this; @@ -106,7 +78,7 @@ throw() { } void comm::AccessPoint::translate(const comm::Socket& socket, sockaddr*& s, int& len) -throw(RuntimeException) { +noexcept(false) { switch(socket.getDomain()) { case Socket::Domain::Inet: @@ -151,7 +123,7 @@ throw(RuntimeException) { } void comm::AccessPoint::asString(std::string& msg) const -throw() { +{ msg += "{ "; if(a_inetAddress.isNull() == false) @@ -166,7 +138,7 @@ throw() { } void comm::AccessPoint::asXML(const char* name, xml::Node* parent) const -throw(RuntimeException) { +noexcept(false) { xml::Node* accessPoint = parent->createChild(name); if(a_inetAddress.isNull() == false) @@ -176,7 +148,7 @@ throw(RuntimeException) { } std::string comm::AccessPoint::serialize() const -throw() { +{ std::string result; if(a_inetAddress.isNull() == false)