Remove dynamic exceptions

[anna.git] / source / statistics / Meter.cpp

diff --git a/source/statistics/Meter.cpp b/source/statistics/Meter.cpp
index ca8025f..3058ebc 100644 (file)
--- a/source/statistics/Meter.cpp
+++ b/source/statistics/Meter.cpp
@@ -1,37 +1,9 @@
-// ANNA - Anna is Not Nothingness 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 //
 
 
 //------------------------------------------------------------------------------
@@ -54,9 +26,9 @@ using namespace anna::statistics;
 //------------------------------------------------------------------------------
 
 // Default Constructor
-Meter::Meter(const std::string & description) {
+Meter::Meter(const std::string & name) : a_accumulator(name) {
   Engine& statsEngine = Engine::instantiate();
-  a_single_accumulator_concept_id = statsEngine.addConcept(description, "ms", true);
+  a_single_accumulator_concept_id = statsEngine.addConcept(name, "ms", true);
 }
 
 
@@ -85,7 +57,7 @@ const Meter & Meter::operator = (const Meter & meter) {
 //------------------------------------------------------------------------------
 //------------------------------------------------------------ Meter::asString()
 //------------------------------------------------------------------------------
-std::string Meter::asString(const int & numberOfDecimals) const throw() {
+std::string Meter::asString(const int & numberOfDecimals) const {
   std::string trace;
   trace =  "\n=====";
   trace += "\nMeter";
@@ -98,7 +70,7 @@ std::string Meter::asString(const int & numberOfDecimals) const throw() {
 //------------------------------------------------------------------------------
 //--------------------------------------------------------------- Meter::asXML()
 //------------------------------------------------------------------------------
-anna::xml::Node* Meter::asXML(anna::xml::Node* parent, const int & numberOfDecimals) const throw() {
+anna::xml::Node* Meter::asXML(anna::xml::Node* parent, const int & numberOfDecimals) const {
   anna::xml::Node* result = parent->createChild("anna.statistics.Meter");
   return (a_accumulator.asXML(result, numberOfDecimals));
 }