X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=source%2Fcore%2Ftracing%2FConfiguration.cpp;h=389da1e193b81b41995f9c3ef195b289d3da4c35;hb=5a6cba5fde2b2f538a7515f8293cc0a8d9589dfa;hp=a8499255ac82711659d4d0f61396fcaf9dfb41cd;hpb=39033fd99e58e994a5e98c1060dcc79e0d81f9c9;p=anna.git diff --git a/source/core/tracing/Configuration.cpp b/source/core/tracing/Configuration.cpp index a849925..389da1e 100644 --- a/source/core/tracing/Configuration.cpp +++ b/source/core/tracing/Configuration.cpp @@ -1,37 +1,9 @@ -// ANNA - Anna is Not Nothingness Anymore -// -// (c) Copyright 2005-2014 Eduardo Ramos Testillano & Francisco Ruiz Rayo -// -// http://redmine.teslayout.com/projects/anna-suite -// -// 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 the copyright holder 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 @@ using namespace anna; //------------------------------------------------------------------------------ //---------------------------------------- Configuration::activateTraceTrigger() //------------------------------------------------------------------------------ -void anna::tracing::Configuration::activateTraceTrigger(const std::string & trigger, bool accumulate, anna::Logger::Level level) throw() { +void anna::tracing::Configuration::activateTraceTrigger(const std::string & trigger, bool accumulate, anna::Logger::Level level) { if(!accumulate) resetTraceTriggers(); RegularExpression regEx(trigger); // not yet compiled (perhaps no regular expressions used) @@ -64,7 +36,7 @@ void anna::tracing::Configuration::activateTraceTrigger(const std::string & trig //------------------------------------------------------------------------------ //-------------------------------------- Configuration::deactivateTraceTrigger() //------------------------------------------------------------------------------ -void anna::tracing::Configuration::deactivateTraceTrigger(const std::string & trigger) throw() { +void anna::tracing::Configuration::deactivateTraceTrigger(const std::string & trigger) { RegularExpression regEx(trigger); // not yet compiled (perhaps no regular expressions used) trace_trigger_map_t::iterator it = a_traceTriggers.find(regEx); @@ -75,7 +47,7 @@ void anna::tracing::Configuration::deactivateTraceTrigger(const std::string & tr //------------------------------------------------------------------------------ //---------------------------------------------------- Configuration::asString() //------------------------------------------------------------------------------ -std::string anna::tracing::Configuration::asString(void) const throw() { +std::string anna::tracing::Configuration::asString(void) const { std::string result = ""; // Gets selective tracing trigger map representation with this format: // 'trigger1(desiredLevel1)|trigger2(desiredLevel2)| ... |triggerN(desiredLevelN)'