X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=source%2Fcomm%2Fhandler%2FManager.cpp;h=99ded886e7d3ce31a8e932ebfaa1740127449ac7;hb=5a6cba5fde2b2f538a7515f8293cc0a8d9589dfa;hp=0e916d62fab8721543aff7e2299e9d918797bd42;hpb=5256cb543a9d35b610df19bd227cde977186aef0;p=anna.git diff --git a/source/comm/handler/Manager.cpp b/source/comm/handler/Manager.cpp index 0e916d6..99ded88 100644 --- a/source/comm/handler/Manager.cpp +++ b/source/comm/handler/Manager.cpp @@ -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 // #include @@ -49,7 +21,7 @@ template <> comm::Communicator* handler::Manager::DatagramSocketAllocator::st_co template <> comm::Communicator* handler::Manager::ClientSocketAllocator::st_communicator = NULL; void handler::Manager::initialize(Communicator* communicator) -throw() { +{ BinderSocketAllocator::st_communicator = communicator; ServerSocketAllocator::st_communicator = communicator; LocalConnectionAllocator::st_communicator = communicator; @@ -59,49 +31,49 @@ throw() { } Handler* handler::Manager::createHandler(comm::BinderSocket* binderSocket) -throw(RuntimeException) { +noexcept(false) { handler::BinderSocket* result = a_binderSockets.create(); result->setup(binderSocket); return result; } Handler* handler::Manager::createHandler(comm::ServerSocket* serverSocket) -throw(RuntimeException) { +noexcept(false) { handler::ServerSocket* result = a_serverSockets.create(); result->setup(serverSocket); return result; } Handler* handler::Manager::createHandler(comm::LocalConnection* localConnection) -throw(RuntimeException) { +noexcept(false) { handler::LocalConnection* result = a_localConnections.create(); result->setup(localConnection); return result; } Handler* handler::Manager::createHandler(comm::RemoteConnection* remoteConnection) -throw(RuntimeException) { +noexcept(false) { handler::RemoteConnection* result = a_remoteConnections.create(); result->setup(remoteConnection); return result; } Handler* handler::Manager::createHandler(comm::DatagramSocket* datagramSocket) -throw(RuntimeException) { +noexcept(false) { handler::DatagramSocket* result = a_datagramSockets.create(); result->setup(datagramSocket); return result; } Handler* handler::Manager::createHandler(comm::ClientSocket* clientSocket) -throw(RuntimeException) { +noexcept(false) { handler::ClientSocket* result = a_clientSockets.create(); result->setup(clientSocket); return result; } void handler::Manager::releaseHandler(Handler* handler) -throw() { +{ if(handler == NULL) return;