X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=include%2Fanna%2Fcore%2Futil%2FSecond.hpp;h=7f7fde65c1b4c83a9a7b8890cba2b70d065bd72a;hb=5a6cba5fde2b2f538a7515f8293cc0a8d9589dfa;hp=546303ecf5a1e0f94f1ffd5dad4805812fcdfa7f;hpb=884501d2411bc4fdfafae65948262c959e068d7d;p=anna.git diff --git a/include/anna/core/util/Second.hpp b/include/anna/core/util/Second.hpp index 546303e..7f7fde6 100644 --- a/include/anna/core/util/Second.hpp +++ b/include/anna/core/util/Second.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_util_Second_hpp @@ -99,62 +71,62 @@ public: * Conversor a numérico. * \return El valor asociado a esta instancia. */ - operator type_t () const throw() { return a_value; } + operator type_t () const { return a_value; } /** * \internal */ - type_t& refValue() throw() { return a_value; } + type_t& refValue() { return a_value; } - Second& operator= (const type_t other) throw() { a_value = other; return *this; } + Second& operator= (const type_t other) { a_value = other; return *this; } - Second& operator= (const Second& other) throw() { a_value = other.a_value; return *this; } + Second& operator= (const Second& other) { a_value = other.a_value; return *this; } - Second& operator= (const Millisecond& other) throw(); + Second& operator= (const Millisecond& other) ; - Second& operator= (const Microsecond& other) throw(); + Second& operator= (const Microsecond& other) ; - bool operator== (const Second& other) const throw() { return a_value == other.a_value; } + bool operator== (const Second& other) const { return a_value == other.a_value; } - bool operator== (const Millisecond& other) const throw(); + bool operator== (const Millisecond& other) const ; - bool operator== (const Microsecond& other) const throw(); + bool operator== (const Microsecond& other) const ; - bool operator!= (const Second& other) const throw() { return a_value != other.a_value; } + bool operator!= (const Second& other) const { return a_value != other.a_value; } - bool operator!= (const Millisecond& other) const throw(); + bool operator!= (const Millisecond& other) const ; - bool operator!= (const Microsecond& other) const throw(); + bool operator!= (const Microsecond& other) const ; - bool operator> (const Second& other) const throw() { return a_value > other.a_value; } + bool operator> (const Second& other) const { return a_value > other.a_value; } - bool operator> (const Millisecond& other) const throw(); + bool operator> (const Millisecond& other) const ; - bool operator> (const Microsecond& other) const throw(); + bool operator> (const Microsecond& other) const ; - bool operator< (const Second& other) const throw() { return a_value < other.a_value; } + bool operator< (const Second& other) const { return a_value < other.a_value; } - bool operator< (const Millisecond& other) const throw(); + bool operator< (const Millisecond& other) const ; - bool operator< (const Microsecond& other) const throw(); + bool operator< (const Microsecond& other) const ; - bool operator>= (const Second& other) const throw() { return a_value >= other.a_value; } + bool operator>= (const Second& other) const { return a_value >= other.a_value; } - bool operator>= (const Millisecond& other) const throw() { return (operator==(other) == true) ? true : operator>(other); } + bool operator>= (const Millisecond& other) const { return (operator==(other) == true) ? true : operator>(other); } - bool operator>= (const Microsecond& other) const throw() { return (operator==(other) == true) ? true : operator>(other); } + bool operator>= (const Microsecond& other) const { return (operator==(other) == true) ? true : operator>(other); } - bool operator<= (const Second& other) const throw() { return a_value <= other.a_value; } + bool operator<= (const Second& other) const { return a_value <= other.a_value; } - bool operator<= (const Millisecond& other) const throw() { return (operator==(other) == true) ? true : operator<(other); } + bool operator<= (const Millisecond& other) const { return (operator==(other) == true) ? true : operator<(other); } - bool operator<= (const Microsecond& other) const throw() { return (operator==(other) == true) ? true : operator<(other); } + bool operator<= (const Microsecond& other) const { return (operator==(other) == true) ? true : operator<(other); } /** * Devuelve el valor asociado a esta instancia. * \return el valor asociado a esta instancia. */ - type_t getValue() const throw() { return a_value; } + type_t getValue() const { return a_value; } /** Devuelve una cadena con la hora en formato 'dd/mm/yyyy hh:mm:ss'. @@ -163,7 +135,7 @@ public: \see man strftime */ - std::string asDateTime(const char* format = "%d/%0m/%Y %T") const throw(); + std::string asDateTime(const char* format = "%d/%0m/%Y %T") const ; /** Devuelve una cadena con la hora en formato 'dd/mm/yyyy hh:mm:ss'. @@ -174,33 +146,33 @@ public: \see man strftime */ - const char* asDateTime(char* result, const char* format = "%d/%0m/%Y %T") const throw(); + const char* asDateTime(char* result, const char* format = "%d/%0m/%Y %T") const ; /** * Devuelve una cadena con el valor de esta instancia y las unidades "sec". * \return una cadena con el valor de esta instancia y las unidades "sec". */ - std::string asString() const throw(); + std::string asString() const ; /** * Devuelve la hora actual de sistema expresada en segundos transcurridos desde el 1 de Enero de 1970 * \return la hora actual de sistema expresada en segundos transcurridos desde el 1 de Enero de 1970 */ - static Second getTime() throw(); + static Second getTime() ; /** * Devuelve la hora actual de sistema expresada en segundos transcurridos desde el 1 de Enero de 1970 aplicando * las correciones correspondientes a la hora local. * \return la hora actual de sistema expresada en segundos transcurridos desde el 1 de Enero de 1970 */ - static Second getLocalTime() throw(); + static Second getLocalTime() ; /** * Obtiene los microsegundos del valor contenido en la cadena recibida como parámetro. * \param value Cadena que contiene los microsegundos habrá sido obtenida con #asString. * \return los microsegundos del valor contenido en la cadena recibida como parámetro. */ - static Second fromString(const std::string& value) throw(RuntimeException); + static Second fromString(const std::string& value) noexcept(false); private: type_t a_value; @@ -208,35 +180,35 @@ private: friend class Millisecond; friend class Microsecond; - friend class Second operator + (const Second& left, const Second& right) throw(); - friend class Second operator - (const Second& left, const Second& right) throw(); - friend class Second operator / (const Second& left, const Second& right) throw(); - friend class Second operator / (const Second& left, const int right) throw(); - friend class Second operator / (const Second& left, const unsigned int right) throw(); + friend class Second operator + (const Second& left, const Second& right) ; + friend class Second operator - (const Second& left, const Second& right) ; + friend class Second operator / (const Second& left, const Second& right) ; + friend class Second operator / (const Second& left, const int right) ; + friend class Second operator / (const Second& left, const unsigned int right) ; }; inline Second operator + (const Second& left, const Second& right) -throw() { +{ return Second(left.a_value + right.a_value); } inline Second operator - (const Second& left, const Second& right) -throw() { +{ return Second(left.a_value - right.a_value); } inline Second operator / (const Second& left, const Second& right) -throw() { +{ return Second(left.a_value / right.a_value); } inline Second operator / (const Second& left, const int right) -throw() { +{ return Second(left.a_value / right); } inline Second operator / (const Second& left, const unsigned int right) -throw() { +{ return Second(left.a_value / right); }