X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=source%2Fcore%2Futil%2FMicrosecond.cpp;h=5b1bce463995671f0c7499e29883bdd86f1afa19;hb=5a6cba5fde2b2f538a7515f8293cc0a8d9589dfa;hp=3b475548adae23eb5f0439bc6b2b5e01527c26e6;hpb=3e258840b15577cb8bda3cdedd0b9b88e16404b3;p=anna.git diff --git a/source/core/util/Microsecond.cpp b/source/core/util/Microsecond.cpp index 3b47554..5b1bce4 100644 --- a/source/core/util/Microsecond.cpp +++ b/source/core/util/Microsecond.cpp @@ -1,37 +1,9 @@ -// ANNA - Anna is Not Nothingness 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 // #include @@ -48,12 +20,12 @@ using namespace anna; #define implement_operator(op) \ bool Microsecond::operator op (const Millisecond& other) const \ - throw ()\ + \ {\ return a_value op (((type_t) other.a_value) * 1000);\ }\ bool Microsecond::operator op (const Second& other) const\ - throw ()\ + \ {\ return a_value op ((type_t) other.a_value * 1000000);\ } @@ -63,14 +35,14 @@ Microsecond::Microsecond(const Millisecond& other) : a_value(other.a_value) { a_ Microsecond::Microsecond(const Second& other) : a_value(other.a_value) { a_value *= (type_t)1000000; } Microsecond& Microsecond::operator= (const Millisecond & other) -throw() { +{ a_value = other.a_value; a_value *= (type_t)1000; return *this; } Microsecond& Microsecond::operator= (const Second & other) -throw() { +{ a_value = other.a_value; a_value *= (type_t)1000000; return *this; @@ -84,7 +56,7 @@ implement_operator( <) //static Microsecond Microsecond::getTime() -throw() { +{ struct timeval tv; gettimeofday(&tv, NULL); Microsecond result(Second(tv.tv_sec)); @@ -93,14 +65,14 @@ throw() { } string Microsecond::asString() const -throw() { +{ string result(functions::asString(a_value)); return result += " us"; } //static Microsecond Microsecond::fromString(const std::string& value) -throw(RuntimeException) { +noexcept(false) { if(value.find(" us") == string::npos) { string msg("String: "); msg += value;