X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=include%2Fanna%2Fcore%2Foam%2FCounterScope.hpp;h=300b821e67c2cddc92dde6c027a45e15bf93507b;hb=5a6cba5fde2b2f538a7515f8293cc0a8d9589dfa;hp=96eceb0e9062020cc15d309a3d6dc465c671fb66;hpb=884501d2411bc4fdfafae65948262c959e068d7d;p=anna.git

diff --git a/include/anna/core/oam/CounterScope.hpp b/include/anna/core/oam/CounterScope.hpp
index 96eceb0..300b821 100644
--- a/include/anna/core/oam/CounterScope.hpp
+++ b/include/anna/core/oam/CounterScope.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_oam_CounterScope_hpp
@@ -72,32 +44,32 @@ 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 el identificador del ambito
      \return El identificador del ambito.
   */
-  const int getId() const throw() { return a_id; }
+  const int getId() const { return a_id; }
 
   /**
      Crea un nuevo contador.
      \param counter Numero logico del contador a crear. Debera ser menor de MaxCounter.
      \param name Nombre logico del ambito.
   */
-  void create(const int counter, const char* name) throw(RuntimeException);
+  void create(const int counter, const char* name) noexcept(false);
 
   /**
      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 ;
 
   /**
    * Devuelve la información relevante de esta instancia en un documento XML.
    * \return la información relevante de esta instancia en un documento XML.
    */
-  xml::Node* asXML(xml::Node* parent) const throw(RuntimeException);
+  xml::Node* asXML(xml::Node* parent) const noexcept(false);
 
 protected:
   /**
@@ -106,7 +78,7 @@ protected:
    * a este ámbito.
    * \return El valor actual del contador.
    */
-  Counter::type_t increment(const int counter, const Counter::type_t value) throw(RuntimeException);
+  Counter::type_t increment(const int counter, const Counter::type_t value) noexcept(false);
 
   /**
    * Establece el valor del contador recibido como parámetro.
@@ -114,19 +86,19 @@ protected:
    * a este ámbito.
    * \return El valor actual del contador.
    */
-  Counter::type_t assign(const int counter, const Counter::type_t value) throw(RuntimeException);
+  Counter::type_t assign(const int counter, const Counter::type_t value) noexcept(false);
 
   /**
    * Devuelve el valor actual del contador pasado como parámetro.
    * \param counter Identificador del contedor cuyo valor queremos obtener.
    */
-  Counter::type_t getValue(const int counter) const throw(RuntimeException);
+  Counter::type_t getValue(const int counter) const noexcept(false);
 
   /**
    * Devuelve la instancia del contador. Puede ser NULL.
    * \return la instancia del contador.
    */
-  const Counter* getCounter(const int counter) const throw(RuntimeException);
+  const Counter* getCounter(const int counter) const noexcept(false);
 
 public:
 
@@ -134,13 +106,13 @@ public:
    * Devuelve el valor actual acumulado del contador pasado como parámetro.
    * \param counter Identificador del contedor cuyo valor acumulado queremos obtener.
    */
-  U64 getAccValue(const int counter) const throw(RuntimeException);
+  U64 getAccValue(const int counter) const noexcept(false);
 
   /**
    * Resetea los valores acumulados totales de los contadores incluidos en el ámbito.
    * \return Numero de contadores afectados que tenian un acumulado no nulo.
    */
-  int resetAccValues() throw(RuntimeException);
+  int resetAccValues() noexcept(false);
 
 private:
   const int a_id;