X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=include%2Fanna%2Ftimex%2FTransaction.hpp;h=2e15ed86ffaa2bbd2384f41007790a407d3f65c3;hb=f34b8069233e9e09208339bb79d8576c1ff962e1;hp=94e3e7962db01a0754419d21830a16080915fd6f;hpb=39033fd99e58e994a5e98c1060dcc79e0d81f9c9;p=anna.git diff --git a/include/anna/timex/Transaction.hpp b/include/anna/timex/Transaction.hpp index 94e3e79..2e15ed8 100644 --- a/include/anna/timex/Transaction.hpp +++ b/include/anna/timex/Transaction.hpp @@ -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 // #ifndef anna_timex_Transaction_hpp @@ -91,26 +63,26 @@ public: Devuelve el contexto asociado a esta transaccion. \return El contexto asociado a esta transaccion. */ - void* getContext() throw() { return a_context; } + void* getContext() { return a_context; } /** Devuelve el contexto asociado a esta transaccion. \return El contexto asociado a esta transaccion. */ - const void* getContext() const throw() { return a_context; } + const void* getContext() const { return a_context; } /** Establece el contexto asociado a esta transaccion. \param context Contexto asociado a esta transaccion. */ - void setContext(void* context) throw() { a_context = context; } + void setContext(void* context) { a_context = context; } /** Devuelve una cadena con la informacion referente a este temporizador. \return Una cadena con la informacion referenta a este temporizador. */ virtual std::string asString() const - throw() { + { std::string msg("Transaction { "); msg += TimeEvent::asString(); msg += " | Contexto: ";