X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=include%2Fanna%2Fcore%2FException.hpp;h=eba4ba24c17c995c413e8acb80311d2151cd9825;hb=5a6cba5fde2b2f538a7515f8293cc0a8d9589dfa;hp=845450091aba948828a5c9ba95bff6c763ceb763;hpb=39033fd99e58e994a5e98c1060dcc79e0d81f9c9;p=anna.git

diff --git a/include/anna/core/Exception.hpp b/include/anna/core/Exception.hpp
index 8454500..eba4ba2 100644
--- a/include/anna/core/Exception.hpp
+++ b/include/anna/core/Exception.hpp
@@ -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 //
 
 
 #ifndef anna_core_Exception_hpp
@@ -71,13 +43,13 @@ public:
   /**
      Destructor.
   */
-  virtual ~Exception() throw() {;}
+  virtual ~Exception() {;}
 
   // Accesores
   /**
      @return Devuelve el texto explicativo asociado a esta excepcion.
   */
-  const std::string& getText() const throw() { return m_text;}
+  const std::string& getText() const { return m_text;}
 
   /**
      @return El nombre del fichero donde se genero la excepcion. Coincidira con el indicado
@@ -89,7 +61,7 @@ public:
      @return La linea del fichero donde se genero la excepcion. Coincidira con la indicada
      en el constructor.
   */
-  int getFromLine() const throw() { return m_fromLine; }
+  int getFromLine() const { return m_fromLine; }
 
   /**
      Establecer un codigo de error asociado a esta excepcion.
@@ -97,12 +69,12 @@ public:
      @param errorCode Valor a establecer. El significado de este error dependera de la
      interpretacion particular que queramos darle en nuestra aplicacion.
   */
-  void setErrorCode(const int errorCode) throw() { m_errorCode = errorCode; }
+  void setErrorCode(const int errorCode) { m_errorCode = errorCode; }
 
   /**
      @return El codigo de error asociado a esta excepcion.
   */
-  int getErrorCode() const throw() { return m_errorCode; }
+  int getErrorCode() const { return m_errorCode; }
 
   // Operadores
   /**
@@ -112,7 +84,7 @@ public:
 
      @return Referencia a esta instancia.
    */
-  Exception& operator = (const Exception& right) throw();
+  Exception& operator = (const Exception& right) ;
 
   // Metodos
   /**
@@ -121,7 +93,7 @@ public:
 
      @return Instancia de la cadena conteniendo la informacion de la excepcion.
   */
-  std::string asString() const throw();
+  std::string asString() const ;
 
   /**
      Devuelve una cadena conteniendo toda la informacion referente a la excepcion
@@ -131,7 +103,7 @@ public:
 
      @return Puntero a la cadena conteniendo la informacion de la excepcion.
   */
-  const char* what() const throw() { return asString().c_str(); }     // JASC, 23/9/2003 antes dAata() ( no tenia el trailing null )
+  const char* what() const noexcept { return asString().c_str(); }     // JASC, 23/9/2003 antes dAata() ( no tenia el trailing null )
 
   /**
      Saca una traza de error en el fichero de log con el texto asociado a este excepcion.
@@ -139,7 +111,7 @@ public:
      @see asString
      @see Logger#write
   */
-  void trace() const throw();
+  void trace() const ;
 
 protected:
   Exception(const char* text, const char* name, const char* fromFile, const int fromLine);
@@ -149,14 +121,14 @@ protected:
 
      @param text Nuevo texto asociado a esta excepcion.
   */
-  void setText(const char* text) throw() { m_text = text; }
+  void setText(const char* text) { m_text = text; }
 
   /**
      Establece el texto asociado a esta excepcion.
 
      @param text Nuevo texto asociado a esta excepcion.
   */
-  void setText(const std::string& text) throw() { m_text = text; }
+  void setText(const std::string& text) { m_text = text; }
 
 private:
   std::string m_text;