X-Git-Url: https://git.teslayout.com/public/public/public/?p=anna.git;a=blobdiff_plain;f=source%2Fcore%2Futil%2FConfiguration.cpp;h=0cdb8fcd32f9faf3a82b1694e31865fcdf2d67d7;hp=cb1eb326e72bc2fc4f4ec5d02ed098499537bd9b;hb=5a6cba5fde2b2f538a7515f8293cc0a8d9589dfa;hpb=af9c86ffb0e28d35ad94d99c5f77e41578c972b4 diff --git a/source/core/util/Configuration.cpp b/source/core/util/Configuration.cpp index cb1eb32..0cdb8fc 100644 --- a/source/core/util/Configuration.cpp +++ b/source/core/util/Configuration.cpp @@ -23,7 +23,7 @@ using namespace anna; const char* Configuration::defaultSection = "@global@"; void Configuration::load(const char* configFile) -throw(RuntimeException) { +noexcept(false) { LOGMETHOD(TraceMethod tm("Configuration", "load", ANNA_FILE_LOCATION)); char buffer [2048]; FILE* file; @@ -60,13 +60,13 @@ throw(RuntimeException) { } bool Configuration::exists(const char* sectionName, const char* variableName) const -throw() { +{ const VariableEx* var = find(string(sectionName), variableName); return (var == NULL) ? false : !var->isNull(); } void Configuration::setDefaultValue(const char* sectionName, const char* variableName, const char* defaultValue) -throw(RuntimeException) { +noexcept(false) { string section(sectionName); VariableEx* var = find(section, variableName); @@ -86,7 +86,7 @@ throw(RuntimeException) { } const char* Configuration::getValue(const char* sectionName, const char* variableName, const bool strict) const -throw(RuntimeException) { +noexcept(false) { const VariableEx* variable = find(string(sectionName), variableName); const char* result(NULL); @@ -108,7 +108,7 @@ throw(RuntimeException) { } int Configuration::getIntegerValue(const char* sectionName, const char* variableName, const bool strict) const -throw(RuntimeException) { +noexcept(false) { return atoi(getValue(sectionName, variableName, strict)); } @@ -151,7 +151,7 @@ bool Configuration::processSection(const int nline, char* buffer, string& curren } void Configuration::processVariable(const int nline, char* buffer, const string& currentSection) -throw(RuntimeException) { +noexcept(false) { char* variableName; char* value; char* aux; @@ -197,7 +197,7 @@ throw(RuntimeException) { } Configuration::VariableEx* Configuration::createVariable(const string& section, const char* variableName) -throw() { +{ map ::iterator isection(a_sections.find(section)); VariableEx* result; VariableEx::Vector* variables; @@ -214,7 +214,7 @@ throw() { } Configuration::VariableEx* Configuration::find(const string& section, const char* variableName) -throw() { +{ VariableEx* result(NULL); map ::iterator isection(a_sections.find(section)); @@ -234,7 +234,7 @@ throw() { } void Configuration::removeAll() -throw() { +{ map ::iterator ii(a_sections.begin()); map ::iterator end(a_sections.end()); VariableEx::Vector::iterator vv, maxvv;