Remove dynamic exceptions

[anna.git] / source / core / oam / Handler.cpp

diff --git a/source/core/oam/Handler.cpp b/source/core/oam/Handler.cpp
index c918331..6aeab5f 100644 (file)
--- a/source/core/oam/Handler.cpp
+++ b/source/core/oam/Handler.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 //
 
 
 // Local
@@ -53,7 +25,7 @@
 //------------------------------------------------------------------------------
 //-------------------------------------------------------- Handler::alarmEvent()
 //------------------------------------------------------------------------------
-const anna::oam::alarm_data_t *anna::oam::Handler::alarmEvent(const anna::oam::Module *module, const char *textPreffix, const char *textSuffix, char textSeparator, bool activation, const int & type, va_list argList) const throw() {
+const anna::oam::alarm_data_t *anna::oam::Handler::alarmEvent(const anna::oam::Module *module, const char *textPreffix, const char *textSuffix, char textSeparator, bool activation, const int & type, va_list argList) const {
   // OAM alarm
   const alarm_data_t *result = module->alarm(type);
 
@@ -82,7 +54,7 @@ const anna::oam::alarm_data_t *anna::oam::Handler::alarmEvent(const anna::oam::M
 
     static char cad_aux[1024];
     vsprintf(cad_aux, alarm.c_str(), argList);
-    std::string trace = module->getClassName();
+    std::string trace = module->getName();
     trace += anna::functions::asString(" | Alarm %s event: %s", (activation ? "activation" : "cancellation"), cad_aux);
     trace += anna::functions::asString(" | Enum type on module: %d", type);
 
@@ -107,7 +79,7 @@ const anna::oam::alarm_data_t *anna::oam::Handler::alarmEvent(const anna::oam::M
 //------------------------------------------------------ Handler::counterEvent()
 //------------------------------------------------------------------------------
 
-const anna::oam::counter_data_t *anna::oam::Handler::counterEvent(const anna::oam::Module *module, const int & type, const int & amount) const throw() {
+const anna::oam::counter_data_t *anna::oam::Handler::counterEvent(const anna::oam::Module *module, const int & type, const int & amount) const {
   // OAM counter
   const counter_data_t *result = module->counter(type);
   // Base text:
@@ -121,7 +93,7 @@ const anna::oam::counter_data_t *anna::oam::Handler::counterEvent(const anna::oa
 
   LOGDEBUG
   (
-    std::string trace = module->getClassName();
+    std::string trace = module->getName();
     trace += anna::functions::asString(" | Counter event: %s", base.c_str());
     trace += anna::functions::asString(" | Enum type on module: %d", type);
     trace += anna::functions::asString(" | Amount increased: %d", amount);