X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=source%2Fcore%2Foam%2FCounterScope.cpp;h=88425587b7181d853413bd477460544c283454b6;hb=5a6cba5fde2b2f538a7515f8293cc0a8d9589dfa;hp=0cbabb6eb287c390ca1db5c34336fdf34b613397;hpb=39033fd99e58e994a5e98c1060dcc79e0d81f9c9;p=anna.git

diff --git a/source/core/oam/CounterScope.cpp b/source/core/oam/CounterScope.cpp
index 0cbabb6..8842558 100644
--- a/source/core/oam/CounterScope.cpp
+++ b/source/core/oam/CounterScope.cpp
@@ -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 //
 
 
 #include <string>
@@ -61,7 +33,7 @@ using namespace anna;
    if (a_counters [index] == NULL) { \
       string msg (asString ()); \
       msg += functions::asText (" | CounterId: ", index); \
-      msg += " | Counter Id is not defined"; \
+      msg += " | Counter Id is not defined yet"; \
       throw RuntimeException (msg, __FILE__, __LINE__); \
    }
 
@@ -74,7 +46,7 @@ oam::CounterScope::~CounterScope() {
 }
 
 void oam::CounterScope::create(const int counter, const char* name)
-throw(RuntimeException) {
+noexcept(false) {
   test_range(counter);
 
   if(a_counters [counter] != NULL) {
@@ -98,7 +70,7 @@ throw(RuntimeException) {
 }
 
 oam::Counter::type_t oam::CounterScope::increment(const int counter, const oam::Counter::type_t value)
-throw(RuntimeException) {
+noexcept(false) {
   test_range(counter);
   test_instance(counter);
   a_counters [counter]->a_value += value;
@@ -108,7 +80,7 @@ throw(RuntimeException) {
 }
 
 oam::Counter::type_t oam::CounterScope::assign(const int counter, const oam::Counter::type_t value)
-throw(RuntimeException) {
+noexcept(false) {
   test_range(counter);
   test_instance(counter);
   a_counters [counter]->a_value = value;
@@ -118,20 +90,20 @@ throw(RuntimeException) {
 }
 
 oam::Counter::type_t oam::CounterScope::getValue(const int counter) const
-throw(RuntimeException) {
+noexcept(false) {
   test_range(counter);
   test_instance(counter);
   return a_counters [counter]->a_value;
 }
 
 U64 oam::CounterScope::getAccValue(const int counter) const
-throw(RuntimeException) {
+noexcept(false) {
   test_range(counter);
   test_instance(counter);
   return a_counters [counter]->a_accValue;
 }
 
-int oam::CounterScope::resetAccValues() throw(RuntimeException) {
+int oam::CounterScope::resetAccValues() noexcept(false) {
   int result = 0; // affected counters
 
   for(int ii = 0; ii < MaxCounter; ii ++)
@@ -142,14 +114,14 @@ int oam::CounterScope::resetAccValues() throw(RuntimeException) {
 }
 
 const oam::Counter* oam::CounterScope::getCounter(const int counter) const
-throw(RuntimeException) {
+noexcept(false) {
   test_range(counter);
   test_instance(counter);
   return a_counters [counter];
 }
 
 string oam::CounterScope::asString() const
-throw() {
+{
   string result("oam::CounterScope { Id: ");
   result += functions::asString(a_id);
   result += " | Name: ";
@@ -158,7 +130,7 @@ throw() {
 }
 
 xml::Node* oam::CounterScope::asXML(xml::Node* parent) const
-throw(RuntimeException) {
+noexcept(false) {
   xml::Node* result = parent->createChild("Scope");
   xml::Node* counter;