X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=source%2Fcore%2Fmt%2FGuard.cpp;h=e3c557565f0a4b6d4cf270c25587fa43ceb00822;hb=e14f6ba5183403d7bbf589ef87b0643b12a0f72c;hp=04589a4282f03de81f7a1e9541b8250fadba0a0f;hpb=39033fd99e58e994a5e98c1060dcc79e0d81f9c9;p=anna.git

diff --git a/source/core/mt/Guard.cpp b/source/core/mt/Guard.cpp
index 04589a4..e3c5575 100644
--- a/source/core/mt/Guard.cpp
+++ b/source/core/mt/Guard.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 //
 
 
 #include <anna/core/mt/Guard.hpp>
@@ -57,7 +29,7 @@ using namespace anna;
       Logger::write (Logger::Local7, msg, (file), (line)); \
    }
 
-Guard::Guard(const Safe* object) throw(RuntimeException) :
+Guard::Guard(const Safe* object) noexcept(false) :
   a_whatis(NULL) {
   if(object == NULL)
     throw RuntimeException("Can not lock NULL object", ANNA_FILE_LOCATION);
@@ -65,7 +37,7 @@ Guard::Guard(const Safe* object) throw(RuntimeException) :
   lock(a_safeObject = const_cast <Safe*>(object), NULL);
 }
 
-Guard::Guard(const Safe* object, const char* whatis) throw(RuntimeException) :
+Guard::Guard(const Safe* object, const char* whatis) noexcept(false) :
   a_whatis(whatis) {
   if(object == NULL)
     throw RuntimeException("Can not lock NULL object", ANNA_FILE_LOCATION);
@@ -74,7 +46,7 @@ Guard::Guard(const Safe* object, const char* whatis) throw(RuntimeException) :
 }
 
 void Guard::deactivate()
-throw() {
+{
   if(a_safeObject == NULL)
     return;
 
@@ -88,7 +60,7 @@ throw() {
 // Logger::writer tambien usa una Guard.
 //--------------------------------------------------------------------------------------------------------------
 void Guard::lock(Safe* safe, const char* whatis)
-throw(RuntimeException) {
+noexcept(false) {
   trace_local7("Guard::lock", safe, __FILE__, __LINE__);
   safe->lock();
 }