X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=include%2Fanna%2Fcore%2Fmt%2FGuard.hpp;h=5c2874462eaa67721eb49bca00a0f4dc72b29b5b;hb=5a6cba5fde2b2f538a7515f8293cc0a8d9589dfa;hp=f9a9f4a916cb537c28817c9ae30ebdc0e81fb8a3;hpb=4e12ac57e93c052f716a6305ad8fc099c45899d1;p=anna.git

diff --git a/include/anna/core/mt/Guard.hpp b/include/anna/core/mt/Guard.hpp
index f9a9f4a..5c28744 100644
--- a/include/anna/core/mt/Guard.hpp
+++ b/include/anna/core/mt/Guard.hpp
@@ -1,37 +1,9 @@
-// ANNA - Anna is Not 'N' Anymore
-//
-// (c) Copyright 2005-2014 Eduardo Ramos Testillano & Francisco Ruiz Rayo
-//
-// https://bitbucket.org/testillano/anna
-//
-// 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 Google Inc. 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 //
 
 
 #ifndef anna_core_mt_Guard_hpp
@@ -66,7 +38,7 @@ public:
     Constructor.
     @param object Sobre el que actuar para iniciar la guarda.
   */
-  Guard(const Safe& object) throw(RuntimeException) : a_whatis(NULL) {
+  Guard(const Safe& object) noexcept(false) : a_whatis(NULL) {
     lock(a_safeObject = const_cast <Safe*>(&object), NULL);
   }
 
@@ -74,14 +46,14 @@ public:
     Constructor.
     @param object Sobre el que actuar para iniciar la guarda.
   */
-  Guard(const Safe* object) throw(RuntimeException);
+  Guard(const Safe* object) noexcept(false);
 
   /**
     Constructor.
     @param object Sobre el que actuar para iniciar la guarda.
     @param whatis Texto que indica la naturaleza del objeto a bloquear.
   */
-  Guard(const Safe& object, const char* whatis) throw(RuntimeException) : a_whatis(whatis) {
+  Guard(const Safe& object, const char* whatis) noexcept(false) : a_whatis(whatis) {
     lock(a_safeObject = const_cast <Safe*>(&object), whatis);
   }
 
@@ -90,25 +62,25 @@ public:
     @param object Sobre el que actuar para iniciar la guarda.
     @param whatis Texto que indica la naturaleza del objeto a bloquear.
   */
-  Guard(const Safe* object, const char* whatis) throw(RuntimeException);
+  Guard(const Safe* object, const char* whatis) noexcept(false);
 
   /**
     Destructor.
     Termina la guarda iniciada con el objeto recibido como parametro en el
     constructor.
   */
-  virtual ~Guard() throw() { deactivate(); }
+  virtual ~Guard() { deactivate(); }
 
   /**
      Desactiva la seccion critica antes de que termine el ambito de actuacion de la misma.
   */
-  void deactivate() throw();
+  void deactivate() ;
 
 private:
   Safe* a_safeObject;
   const char* a_whatis;
 
-  void lock(Safe*, const char* whatis) throw(RuntimeException);
+  void lock(Safe*, const char* whatis) noexcept(false);
 };
 
 } //namespace anna