X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=include%2Fanna%2Fcore%2FAutoPointer.hpp;h=1213e3b0195582d9c13e350350faf2cff1bc061e;hb=5a6cba5fde2b2f538a7515f8293cc0a8d9589dfa;hp=a945edbcda71a153b84d5848e33422858ab3999d;hpb=4e12ac57e93c052f716a6305ad8fc099c45899d1;p=anna.git diff --git a/include/anna/core/AutoPointer.hpp b/include/anna/core/AutoPointer.hpp index a945edb..1213e3b 100644 --- a/include/anna/core/AutoPointer.hpp +++ b/include/anna/core/AutoPointer.hpp @@ -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 // #ifndef anna_core_AutoPointer_hpp @@ -70,19 +42,19 @@ public: * Devuelve la operación que se realizará cuando se termine con esta instancia y se invoque a anna::AutoPointer::release. * \return la operación que se realizará cuando se termine con esta instancia y se invoque a anna::AutoPointer::release. */ - WhenFinished::_v getWhenFinished() const throw() { return a_whenFinished; } + WhenFinished::_v getWhenFinished() const { return a_whenFinished; } /** * Establece la operación a realizar cuando se invoca al método anna::AutoPointer::release. * \param whenFinished Indica que operación a realizar cuando se invoque a anna::AutoPointer::release. */ - void setWhenFinished(const WhenFinished::_v whenFinished) throw() { a_whenFinished = whenFinished; } + void setWhenFinished(const WhenFinished::_v whenFinished) { a_whenFinished = whenFinished; } /** Devuelve una cadena con la informacion relevante de este objeto. \return Una cadena con la informacion relevante de este objeto. */ - virtual String asString() const throw(); + virtual String asString() const ; /** * Si fuera necesario libera de la instancia recibida. @@ -90,7 +62,7 @@ public: * \return Devolverá \em NULL si la instancia ha sido liberada o la misma instancia recibida en caso de que no haya sido liberada. */ template static T* release(T& instance) - throw() { + { return release(&instance); } @@ -100,7 +72,7 @@ public: * \return Devolverá \em NULL si la instancia ha sido liberada o la misma instancia recibida en caso de que no haya sido liberada. */ template static T* release(T* instance) - throw() { + { if(instance == NULL) return NULL; @@ -116,7 +88,7 @@ public: * Devuelve el nombre lógico de esta clase. * \return el nombre lógico de esta clase. */ - static const char* className() throw() { return "AutoPointer"; } + static const char* className() { return "AutoPointer"; } protected: /**