X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=include%2Fanna%2Fcore%2Foam%2FCounter.hpp;h=8ba93f16a1ef0b9a993a0df6f60f1b00a0693e6b;hb=5a6cba5fde2b2f538a7515f8293cc0a8d9589dfa;hp=758d9b4c94499ccfaea8da63b592e8f03cb98595;hpb=39033fd99e58e994a5e98c1060dcc79e0d81f9c9;p=anna.git diff --git a/include/anna/core/oam/Counter.hpp b/include/anna/core/oam/Counter.hpp index 758d9b4..8ba93f1 100644 --- a/include/anna/core/oam/Counter.hpp +++ b/include/anna/core/oam/Counter.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_core_oam_Counter_hpp @@ -59,7 +31,7 @@ public: de crear el contador mediante el metodo CounterScope::create. \return El nombre logico del contador. */ - const std::string& getName() const throw() { return a_name; } + const std::string& getName() const { return a_name; } /** Devuelve la referencia logica de este contador. Sera el numero resultante de combinar @@ -67,44 +39,44 @@ public: ambito. \return La referencia logica de este contador. */ - int getReference() const throw(); + int getReference() const ; /** * Devuelve el valor actual de este contador. Este valor se podrĂ¡ a cero cada vez que los contadores * se graben. * \return El valor actual de este contador. */ - type_t getValue() const throw() { return a_value; } + type_t getValue() const { return a_value; } /** * Devuelve el valor acumulado de este contador. * \return El valor acumulado de este contador. */ - U64 getAccumulatedValue() const throw() { return a_accValue; } + U64 getAccumulatedValue() const { return a_accValue; } /** Operador de conversion. \return El valor asociado a este contador. */ - operator type_t () const throw() { return a_value; } + operator type_t () const { return a_value; } /** Inicializa el valor de este contador. */ - void reset() throw() { a_value = 0; } + void reset() { a_value = 0; } /** Inicializa el valor acumulado de este contador. \return Devuelve 'true' si fue reseteado, 'false' si ya lo estaba */ - bool resetAcc() throw() { bool result = (a_accValue != 0); a_accValue = 0; return result; } + bool resetAcc() { bool result = (a_accValue != 0); a_accValue = 0; return result; } /** Devuelve una cadena con la informacion relevante de este objeto. \return Una cadena con la informacion relevante de este objeto. */ - std::string asString() const throw(); + std::string asString() const ; private: CounterScope& a_scope; @@ -116,7 +88,7 @@ private: Counter(CounterScope& scope, const int id, const char* name); Counter(const Counter&); - void debug() const throw(); + void debug() const ; friend class CounterScope; };