X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=include%2Fanna%2Ftimex%2FMeter.hpp;h=5854d9f4fa1baadbaa3da57d4032bf272791eb43;hb=5a6cba5fde2b2f538a7515f8293cc0a8d9589dfa;hp=7b2be3654b7e9e0bc029331af6fd44127679a9d6;hpb=4e12ac57e93c052f716a6305ad8fc099c45899d1;p=anna.git

diff --git a/include/anna/timex/Meter.hpp b/include/anna/timex/Meter.hpp
index 7b2be36..5854d9f 100644
--- a/include/anna/timex/Meter.hpp
+++ b/include/anna/timex/Meter.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_timex_Meter_hpp
@@ -87,7 +59,7 @@ public:
    * \warning Elimina el punto de referencia temporal que puediera haberse establecido con #setTopReference.
    * \return El número de milisegundos transcurridos desde la última vez que inicializamos la cuenta de temporizacion.
    */
-  Millisecond setControlPoint() throw() {
+  Millisecond setControlPoint() {
     Millisecond now = functions::millisecond();
     Millisecond result = (now > a_timestamp) ? (now - a_timestamp) : (Millisecond)0;
     a_timestamp = now;
@@ -108,12 +80,12 @@ public:
    * esa tarea ha sido finalidad.
    *
    */
-  void setTopReference(const Millisecond & topReference) throw() { a_topReference = topReference; }
+  void setTopReference(const Millisecond & topReference) { a_topReference = topReference; }
 
   /**
    * Elimina el punto de referencia temporal.
    */
-  void clearTopReference() throw() { a_topReference = 0; }
+  void clearTopReference() { a_topReference = 0; }
 
   /**
    * Devuelve el número de milisegundos transcurridos desde la última vez que inicializamos la cuenta de temporización.
@@ -123,7 +95,7 @@ public:
    * \return El número de milisegundos transcurridos desde la última vez que inicializamos la cuenta de temporizacion.
    * \warning Si detecta algun fallo devolvera 0.
    */
-  Millisecond getDelay() const throw() {
+  Millisecond getDelay() const {
     Millisecond now = (a_topReference == 0) ? functions::millisecond() : a_topReference;
     return (now > a_timestamp) ? (now - a_timestamp) : (Millisecond)0;
   }
@@ -134,13 +106,13 @@ public:
    * \warning Elimina el punto de referencia temporal que puediera haberse establecido con #setTopReference.
    * \see anna::functions::millisecond.
    */
-  Meter& operator= (const Millisecond & timestamp) throw() { a_timestamp = timestamp; a_topReference = 0; return *this; }
+  Meter& operator= (const Millisecond & timestamp) { a_timestamp = timestamp; a_topReference = 0; return *this; }
 
   /**
    * Operador copia.
    * \param other Instancia de la que copiar.
    */
-  Meter& operator= (const Meter& other) throw() { a_timestamp = other.a_timestamp; a_topReference = other.a_topReference; return *this; }
+  Meter& operator= (const Meter& other) { a_timestamp = other.a_timestamp; a_topReference = other.a_topReference; return *this; }
 
 private:
   Millisecond a_topReference;