X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=include%2Fanna%2Fcore%2Fmt%2FSafeSortedVector.hpp;h=50d308cc67593aca644d80a2eb979cdb319c7b19;hb=5a6cba5fde2b2f538a7515f8293cc0a8d9589dfa;hp=70c344ed80e3640624cde2ee2721679a6073fd91;hpb=4e12ac57e93c052f716a6305ad8fc099c45899d1;p=anna.git diff --git a/include/anna/core/mt/SafeSortedVector.hpp b/include/anna/core/mt/SafeSortedVector.hpp index 70c344e..50d308c 100644 --- a/include/anna/core/mt/SafeSortedVector.hpp +++ b/include/anna/core/mt/SafeSortedVector.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_mt_SafeSortedVector_hpp @@ -77,7 +49,7 @@ public: vector o \em en otro caso. */ bool contains(const T* t) const - throw() { + { if(t == NULL) return false; @@ -91,7 +63,7 @@ public: \return \em true si ha registrado la nueva instancia o \em false en otro caso. */ bool add(T* t) - throw(RuntimeException) { + noexcept(false) { if(t == NULL) return false; @@ -105,7 +77,7 @@ public: \return \em true si ha eliminado la instancia o \em false en otro caso. */ bool erase(T* t) - throw(RuntimeException) { + noexcept(false) { if(t == NULL) return false; @@ -119,7 +91,7 @@ public: \return la instancia asociada a la clave recibida como parametro o NULL si no existe. */ T* find(const TKey key) - throw() { + { Guard guard(this, "SafeSortedVector ::find"); return SortedVector ::find(key); } @@ -129,7 +101,7 @@ public: \param key Clave a buscar en el vector. \return la instancia asociada a la clave recibida como parametro o NULL si no existe. */ - const T* find(const TKey key) const throw() { + const T* find(const TKey key) const { return const_cast *>(this)->find(key); } };