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 d6cdade..6aeab5f 100644 (file)
--- a/source/core/oam/Handler.cpp
+++ b/source/core/oam/Handler.cpp
@@ -25,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);
 
@@ -54,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);
 
@@ -79,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:
@@ -93,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);