Remove dynamic exceptions

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

diff --git a/source/core/oam/Module.cpp b/source/core/oam/Module.cpp
index 2fa403e..8f8af47 100644 (file)
--- a/source/core/oam/Module.cpp
+++ b/source/core/oam/Module.cpp
@@ -42,7 +42,7 @@ anna::oam::Module::~Module() {
 //------------------------------------------------------------------------------
 //----------------------------------------------------------- Module::getScope()
 //------------------------------------------------------------------------------
-anna::oam::CounterScope *anna::oam::Module::getScope(const int &id) throw() {
+anna::oam::CounterScope *anna::oam::Module::getScope(const int &id) {
   scope_iterator it = scope_find(id);
   return ((it != scope_end()) ? scope(it) : NULL);
 }
@@ -50,7 +50,7 @@ anna::oam::CounterScope *anna::oam::Module::getScope(const int &id) throw() {
 ////------------------------------------------------------------------------------
 ////------------------------------------------------------- Module::alarm_remove()
 ////------------------------------------------------------------------------------
-//bool anna::oam::Module::alarm_remove(const int &key) throw() {
+//bool anna::oam::Module::alarm_remove(const int &key) {
 //   alarm_iterator it = alarm_find(key);
 //   if (it != alarm_end()) {
 //      a_alarms.erase(key);
@@ -63,7 +63,7 @@ anna::oam::CounterScope *anna::oam::Module::getScope(const int &id) throw() {
 ////------------------------------------------------------------------------------
 ////----------------------------------------------------- Module::counter_remove()
 ////------------------------------------------------------------------------------
-//bool anna::oam::Module::counter_remove(const int &key) throw() {
+//bool anna::oam::Module::counter_remove(const int &key) {
 //   counter_iterator it = counter_find(key);
 //   if (it != counter_end()) {
 //      a_counters.erase(key);
@@ -80,7 +80,7 @@ anna::oam::CounterScope *anna::oam::Module::getScope(const int &id) throw() {
 //------------------------------------------------------------------------------
 //----------------------------------------------------- Module::enableCounters()
 //------------------------------------------------------------------------------
-void anna::oam::Module::enableCounters(void) throw() {
+void anna::oam::Module::enableCounters(void) {
   a_counters_enabled = true;
   LOGDEBUG(anna::Logger::debug("Scoped counters ENABLED", ANNA_FILE_LOCATION));
 }
@@ -89,7 +89,7 @@ void anna::oam::Module::enableCounters(void) throw() {
 //------------------------------------------------------------------------------
 //---------------------------------------------------- Module::disableCounters()
 //------------------------------------------------------------------------------
-void anna::oam::Module::disableCounters(void) throw() {
+void anna::oam::Module::disableCounters(void) {
   a_counters_enabled = false;
   LOGDEBUG(anna::Logger::debug("Scoped counters DISABLED", ANNA_FILE_LOCATION));
 }
@@ -98,7 +98,7 @@ void anna::oam::Module::disableCounters(void) throw() {
 //------------------------------------------------------------------------------
 //------------------------------------------------------- Module::enableAlarms()
 //------------------------------------------------------------------------------
-void anna::oam::Module::enableAlarms(void) throw() {
+void anna::oam::Module::enableAlarms(void) {
   a_alarms_enabled = true;
   LOGDEBUG(anna::Logger::debug("Scoped alarms ENABLED", ANNA_FILE_LOCATION));
 }
@@ -107,7 +107,7 @@ void anna::oam::Module::enableAlarms(void) throw() {
 //------------------------------------------------------------------------------
 //------------------------------------------------------ Module::disableAlarms()
 //------------------------------------------------------------------------------
-void anna::oam::Module::disableAlarms(void) throw() {
+void anna::oam::Module::disableAlarms(void) {
   a_alarms_enabled = false;
   LOGDEBUG(anna::Logger::debug("Scoped alarms DISABLED", ANNA_FILE_LOCATION));
 }
@@ -116,7 +116,7 @@ void anna::oam::Module::disableAlarms(void) throw() {
 //------------------------------------------------------------------------------
 //------------------------------------------------ Module::enableAlarmsPreffix()
 //------------------------------------------------------------------------------
-void anna::oam::Module::enableAlarmsPreffix(void) throw() {
+void anna::oam::Module::enableAlarmsPreffix(void) {
   a_alarms_preffix_enabled = true;
   LOGDEBUG(anna::Logger::debug("Alarm preffix module components SHOWN", ANNA_FILE_LOCATION));
 }
@@ -125,7 +125,7 @@ void anna::oam::Module::enableAlarmsPreffix(void) throw() {
 //------------------------------------------------------------------------------
 //------------------------------------------------- Module::enableAlarmsSuffix()
 //------------------------------------------------------------------------------
-void anna::oam::Module::enableAlarmsSuffix(void) throw() {
+void anna::oam::Module::enableAlarmsSuffix(void) {
   a_alarms_suffix_enabled = true;
   LOGDEBUG(anna::Logger::debug("Alarm suffix module components SHOWN", ANNA_FILE_LOCATION));
 }
@@ -134,7 +134,7 @@ void anna::oam::Module::enableAlarmsSuffix(void) throw() {
 //------------------------------------------------------------------------------
 //----------------------------------------------- Module::disableAlarmsPreffix()
 //------------------------------------------------------------------------------
-void anna::oam::Module::disableAlarmsPreffix(void) throw() {
+void anna::oam::Module::disableAlarmsPreffix(void) {
   a_alarms_preffix_enabled = false;
   LOGDEBUG(anna::Logger::debug("Alarm preffix module components HIDDEN", ANNA_FILE_LOCATION));
 }
@@ -143,7 +143,7 @@ void anna::oam::Module::disableAlarmsPreffix(void) throw() {
 //------------------------------------------------------------------------------
 //------------------------------------------------ Module::disableAlarmsSuffix()
 //------------------------------------------------------------------------------
-void anna::oam::Module::disableAlarmsSuffix(void) throw() {
+void anna::oam::Module::disableAlarmsSuffix(void) {
   a_alarms_suffix_enabled = false;
   LOGDEBUG(anna::Logger::debug("Alarm suffix module components HIDDEN", ANNA_FILE_LOCATION));
 }
@@ -152,7 +152,7 @@ void anna::oam::Module::disableAlarmsSuffix(void) throw() {
 //------------------------------------------------------------------------------
 //--------------------------------- Module::getDefaultInternalAlarmDescription()
 //------------------------------------------------------------------------------
-std::string anna::oam::Module::getDefaultInternalAlarmDescription(const int & type) const throw() {
+std::string anna::oam::Module::getDefaultInternalAlarmDescription(const int & type) const {
   return UNDEFINED_EVENT_DESCRIPTION;
 }
 
@@ -160,7 +160,7 @@ std::string anna::oam::Module::getDefaultInternalAlarmDescription(const int & ty
 //------------------------------------------------------------------------------
 //------------------------------- Module::getDefaultInternalCounterDescription()
 //------------------------------------------------------------------------------
-std::string anna::oam::Module::getDefaultInternalCounterDescription(const int & type) const throw() {
+std::string anna::oam::Module::getDefaultInternalCounterDescription(const int & type) const {
   return UNDEFINED_EVENT_DESCRIPTION;
 }
 
@@ -168,7 +168,7 @@ std::string anna::oam::Module::getDefaultInternalCounterDescription(const int &
 //------------------------------------------------------------------------------
 //---------------------------------------------- Module::alarmComponentsToText()
 //------------------------------------------------------------------------------
-std::string anna::oam::Module::alarmComponentsToText(const std::vector<std::string> & components, const std::string & psL, const std::string & psS, const std::string & psR) const throw() {
+std::string anna::oam::Module::alarmComponentsToText(const std::vector<std::string> & components, const std::string & psL, const std::string & psS, const std::string & psR) const {
   if(components.size() == 0) return ("");
 
   std::vector<std::string>::const_iterator it_min(components.begin());
@@ -187,7 +187,7 @@ std::string anna::oam::Module::alarmComponentsToText(const std::vector<std::stri
 //------------------------------------------------------------------------------
 //------------------------------ Module::getAlarmPreffixSuffixAndZoneSeparator()
 //------------------------------------------------------------------------------
-void anna::oam::Module::getAlarmPreffixSuffixAndZoneSeparator(std::string & preffix, std::string & suffix, char & zS) const throw() {
+void anna::oam::Module::getAlarmPreffixSuffixAndZoneSeparator(std::string & preffix, std::string & suffix, char & zS) const {
   Configuration &conf = Configuration::instantiate();
   const std::vector<std::string> * globalPreffixComponents = conf.getAlarmPreffixComponents();
   const std::vector<std::string> * globalSuffixComponents = conf.getAlarmSuffixComponents();
@@ -225,7 +225,7 @@ void anna::oam::Module::getAlarmPreffixSuffixAndZoneSeparator(std::string & pref
 //------------------------------------------------------------------------------
 //--------------------------------------------- Module::initializeCounterScope()
 //------------------------------------------------------------------------------
-void anna::oam::Module::initializeCounterScope(const int & scopeId, const std::string & description) throw(anna::RuntimeException) {
+void anna::oam::Module::initializeCounterScope(const int & scopeId, const std::string & description) noexcept(false) {
   LOGMETHOD(anna::TraceMethod tttm("anna::oam::Module", "initializeCounterScope", ANNA_FILE_LOCATION));
 
   // Order of use:
@@ -266,7 +266,7 @@ void anna::oam::Module::initializeCounterScope(const int & scopeId, const std::s
 //------------------------------------------------------------------------------
 //---------------------------------------------- Module::setActiveCounterScope()
 //------------------------------------------------------------------------------
-void anna::oam::Module::setActiveCounterScope(const int & scopeId) throw() {
+void anna::oam::Module::setActiveCounterScope(const int & scopeId) {
   anna::oam::CounterScope *scope = getScope(scopeId);
 
   if(!scope) {
@@ -281,7 +281,7 @@ void anna::oam::Module::setActiveCounterScope(const int & scopeId) throw() {
 //------------------------------------------------------------------------------
 //---------------------------------------------------- Module::registerCounter()
 //------------------------------------------------------------------------------
-void anna::oam::Module::registerCounter(const int & type, const std::string & description, const int & offset) throw(anna::RuntimeException) {
+void anna::oam::Module::registerCounter(const int & type, const std::string & description, const int & offset) noexcept(false) {
   // Handler-specific
   a_handler->registerCounter(this, type, description, offset);
 
@@ -331,7 +331,7 @@ void anna::oam::Module::registerCounter(const int & type, const std::string & de
 //------------------------------------------------------------------------------
 //------------------------------------------------------ Module::registerAlarm()
 //------------------------------------------------------------------------------
-void anna::oam::Module::registerAlarm(const int & type, const std::string &description, const int & externalId, const std::string & dynamicVariablesCSL, const int & activationId, const int & cancellationId) throw(anna::RuntimeException) {
+void anna::oam::Module::registerAlarm(const int & type, const std::string &description, const int & externalId, const std::string & dynamicVariablesCSL, const int & activationId, const int & cancellationId) noexcept(false) {
   // Handler-specific
   a_handler->registerAlarm(this, type, description, externalId, dynamicVariablesCSL, activationId, cancellationId);
   // Check type existence:
@@ -375,7 +375,7 @@ void anna::oam::Module::registerAlarm(const int & type, const std::string &descr
 //------------------------------------------------------------------------------
 //------------------------------------------------------ Module::activateAlarm()
 //------------------------------------------------------------------------------
-void anna::oam::Module::alarmEvent(bool activation, const int & type, va_list argList) const throw() {
+void anna::oam::Module::alarmEvent(bool activation, const int & type, va_list argList) const {
   // Preffix/Suffix and separator:
   std::string userPreffix, userSuffix; char separator;
   getAlarmPreffixSuffixAndZoneSeparator(userPreffix, userSuffix, separator);
@@ -391,7 +391,7 @@ void anna::oam::Module::alarmEvent(bool activation, const int & type, va_list ar
 //------------------------------------------------------------------------------
 //------------------------------------------------------ Module::activateAlarm()
 //------------------------------------------------------------------------------
-void anna::oam::Module::activateAlarm(int type, ...) const throw(anna::RuntimeException) {
+void anna::oam::Module::activateAlarm(int type, ...) const noexcept(false) {
 //   LOGMETHOD(anna::TraceMethod tttm("anna::oam::Module", "activateAlarm", ANNA_FILE_LOCATION));
 
   // Checkings
@@ -417,7 +417,7 @@ void anna::oam::Module::activateAlarm(int type, ...) const throw(anna::RuntimeEx
 //------------------------------------------------------------------------------
 //-------------------------------------------------------- Module::cancelAlarm()
 //------------------------------------------------------------------------------
-void anna::oam::Module::cancelAlarm(int type, ...) const throw(anna::RuntimeException) {
+void anna::oam::Module::cancelAlarm(int type, ...) const noexcept(false) {
 //   LOGMETHOD(anna::TraceMethod tttm("anna::oam::Module", "cancelAlarm", ANNA_FILE_LOCATION));
 
   // Checkings
@@ -443,7 +443,7 @@ void anna::oam::Module::cancelAlarm(int type, ...) const throw(anna::RuntimeExce
 //------------------------------------------------------------------------------
 //-------------------------------------------------------------- Module::count()
 //------------------------------------------------------------------------------
-void anna::oam::Module::count(const int & type, const int & amount) throw(anna::RuntimeException) {
+void anna::oam::Module::count(const int & type, const int & amount) noexcept(false) {
 //   LOGMETHOD(anna::TraceMethod tttm("anna::oam::Module", "count", ANNA_FILE_LOCATION));
 
   // Checkings
@@ -465,7 +465,7 @@ void anna::oam::Module::count(const int & type, const int & amount) throw(anna::
 //------------------------------------------------------------------------------
 //------------------------------------------------------ Module::resetCounters()
 //------------------------------------------------------------------------------
-int anna::oam::Module::resetCounters(const int & scopeId) throw() {
+int anna::oam::Module::resetCounters(const int & scopeId) {
   LOGMETHOD(anna::TraceMethod tttm("anna::oam::Module", "resetCounters", ANNA_FILE_LOCATION));
   int result = 0; // affected number
 
@@ -496,7 +496,7 @@ anna::oam::Module::RecordingGuard::~RecordingGuard() {
 //------------------------------------------------------------------------------
 //----------------------------------------------------- Module::recordCounters()
 //------------------------------------------------------------------------------
-void anna::oam::Module::recordCounters() throw(anna::RuntimeException) {
+void anna::oam::Module::recordCounters() noexcept(false) {
   LOGMETHOD(anna::TraceMethod tttm("anna::oam::Module", "recordCounters", ANNA_FILE_LOCATION));
 
   if(a_counterRecorder == NULL)
@@ -543,7 +543,7 @@ void anna::oam::Module::recordCounters() throw(anna::RuntimeException) {
 //------------------------------------------------------------------------------
 //----------------------------------------------------------- Module::asString()
 //------------------------------------------------------------------------------
-std::string anna::oam::Module::asString(void) const throw() {
+std::string anna::oam::Module::asString(void) const {
   std::string trace;
   trace = "Module name: '";
   trace += getName();
@@ -616,7 +616,7 @@ std::string anna::oam::Module::asString(void) const throw() {
 //------------------------------------------------------------------------------
 //-------------------------------------------------------------- Module::asXML()
 //------------------------------------------------------------------------------
-anna::xml::Node* anna::oam::Module::asXML(anna::xml::Node* parent) const throw() {
+anna::xml::Node* anna::oam::Module::asXML(anna::xml::Node* parent) const {
   anna::xml::Node* result = parent->createChild("oam.Module");
   result->createAttribute("Name", getName());
   result->createAttribute("Counters", a_counters_enabled ? "Enabled" : "Disabled");