X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=source%2Fcore%2Futil%2FMillisecond.cpp;h=8219c35a541fd0a95af40683279ed9bedbc299bb;hb=5a6cba5fde2b2f538a7515f8293cc0a8d9589dfa;hp=a8fe87fa4d9660b8c7d09f00bd5d2bdf8ba7e4a1;hpb=39033fd99e58e994a5e98c1060dcc79e0d81f9c9;p=anna.git

diff --git a/source/core/util/Millisecond.cpp b/source/core/util/Millisecond.cpp
index a8fe87f..8219c35 100644
--- a/source/core/util/Millisecond.cpp
+++ b/source/core/util/Millisecond.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 <time.h>
@@ -48,12 +20,12 @@ using namespace anna;
 
 #define implement_operator(op) \
    bool Millisecond::operator op (const Second& other) const \
-      throw ()\
+      \
    {\
       return a_value op (other.a_value * (type_t)1000);\
    }\
    bool Millisecond::operator op (const Microsecond& other) const\
-      throw ()\
+      \
    {\
       return a_value op (other.a_value / 1000);\
    }
@@ -63,14 +35,14 @@ Millisecond::Millisecond(const Second& other) : a_value(other.a_value) { a_value
 Millisecond::Millisecond(const Microsecond& other) : a_value(other.a_value / 1000) {;}
 
 Millisecond& Millisecond::operator= (const Second & other)
-throw() {
+{
   a_value = other.a_value;
   a_value *= (type_t)1000;
   return *this;
 }
 
 Millisecond& Millisecond::operator= (const Microsecond & other)
-throw() {
+{
   a_value = (other.a_value / 1000);
   return *this;
 }
@@ -82,7 +54,7 @@ implement_operator( <)
 
 //static
 Millisecond Millisecond::getTime()
-throw() {
+{
   struct timeval tv;
   gettimeofday(&tv, NULL);
   Millisecond result(Second(tv.tv_sec));
@@ -92,7 +64,7 @@ throw() {
 }
 
 timeval* Millisecond::getTimeVal(timeval& tv) const
-throw() {
+{
   if(a_value < 0)
     return NULL;
 
@@ -102,14 +74,14 @@ throw() {
 }
 
 string Millisecond::asString() const
-throw() {
+{
   string result(functions::asString(a_value));
   return result += " ms";
 }
 
 //static
 Millisecond Millisecond::fromString(const std::string& value)
-throw(RuntimeException) {
+noexcept(false) {
   if(value.find(" ms") == string::npos) {
     string msg("String: ");
     msg += value;