X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=include%2Fanna%2Fcore%2Futil%2FCommaSeparatedList.hpp;h=5ebd5bbfe1d3f463569ed0ae507d3e03791d2096;hb=HEAD;hp=542a9520dcc9a260a87a4f6345281dd65f32e1de;hpb=4e12ac57e93c052f716a6305ad8fc099c45899d1;p=anna.git diff --git a/include/anna/core/util/CommaSeparatedList.hpp b/include/anna/core/util/CommaSeparatedList.hpp index 542a952..5ebd5bb 100644 --- a/include/anna/core/util/CommaSeparatedList.hpp +++ b/include/anna/core/util/CommaSeparatedList.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_util_CommaSeparatedList_hpp @@ -107,7 +79,7 @@ public: \param t Parametro con el que ampliar la lista. \return La instancia de la lista destino. */ - CommaSeparatedList& operator, (T& t) throw() { a_parameters.push_back(&t); return *this; } + CommaSeparatedList& operator, (T& t) { a_parameters.push_back(&t); return *this; } /** Operador de asignacion. @@ -115,14 +87,14 @@ public: \param t Parametro con el que ampliar la lista. \return La instancia de la lista destino. */ - CommaSeparatedList& operator= (T& t) throw() { a_parameters.push_back(&t); return *this; } + CommaSeparatedList& operator= (T& t) { a_parameters.push_back(&t); return *this; } /** Operador de copia. \param rsh Lista de parametros a copiar. \return La instancia de la lista destino. */ - CommaSeparatedList& operator= (CommaSeparatedList& rsh) throw() { + CommaSeparatedList& operator= (CommaSeparatedList& rsh) { if(this != &rsh) a_parameters = rsh.parameters; @@ -132,43 +104,43 @@ public: /** Elimina el contenido actual de la lista de parametros. */ - void clear() throw() { a_parameters.clear(); } + void clear() { a_parameters.clear(); } /** Devuelve un iterator al primer parametro de la lista. \return Un iterator al primer parametro de la lista. */ - iterator begin() throw() { return a_parameters.begin(); } + iterator begin() { return a_parameters.begin(); } /** Devuelve un iterator al primer parametro de la lista. \return Un iterator al primer parametro de la lista. */ - const_iterator begin() const throw() { return a_parameters.begin(); } + const_iterator begin() const { return a_parameters.begin(); } /** Devuelve un iterator al ultimo parametro de la lista. \return Un iterator al ultimo parametro de la lista. */ - iterator end() throw() { return a_parameters.end(); } + iterator end() { return a_parameters.end(); } /** Devuelve un iterator al ultimo parametro de la lista. \return Un iterator al ultimo parametro de la lista. */ - const_iterator end() const throw() { return a_parameters.end(); } + const_iterator end() const { return a_parameters.end(); } /** Devuelve el puntero sobre el que esta posicionado el iterador recibido como parametro. \return El puntero sobre el que esta posicionado el iterador recibido como parametro. */ - static T* data(iterator& ii) throw() { return *ii; } + static T* data(iterator& ii) { return *ii; } /** Devuelve el puntero sobre el que esta posicionado el iterador recibido como parametro. \return El puntero sobre el que esta posicionado el iterador recibido como parametro. */ - static const T* data(const_iterator& ii) throw() { return *ii; } + static const T* data(const_iterator& ii) { return *ii; } private: std::vector a_parameters;