X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;ds=sidebyside;f=source%2Fdiameter%2Fcodec%2Fbasetypes%2FTime.cpp;h=16fbcc64b381458a70d3aceab026b7af4118e2f3;hb=5a6cba5fde2b2f538a7515f8293cc0a8d9589dfa;hp=03cb7fe68550f59e021f44a350d45fd59a05e2ce;hpb=4e12ac57e93c052f716a6305ad8fc099c45899d1;p=anna.git diff --git a/source/diameter/codec/basetypes/Time.cpp b/source/diameter/codec/basetypes/Time.cpp index 03cb7fe..16fbcc6 100644 --- a/source/diameter/codec/basetypes/Time.cpp +++ b/source/diameter/codec/basetypes/Time.cpp @@ -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 // // Local @@ -43,7 +15,7 @@ //------------------------------------------------------------------------------ //---------------------------------------------------------- Time::updateBasic() //------------------------------------------------------------------------------ -void anna::diameter::codec::basetypes::Time::updateBasic() throw(anna::RuntimeException) { +void anna::diameter::codec::basetypes::Time::updateBasic() noexcept(false) { std::string result; result += (char)(a_ntpTimestamp >> 24); result += (char)(a_ntpTimestamp >> 16); @@ -56,7 +28,7 @@ void anna::diameter::codec::basetypes::Time::updateBasic() throw(anna::RuntimeEx //------------------------------------------------------------------------------ //--------------------------------------------------- Time::setPrintableString() //------------------------------------------------------------------------------ -void anna::diameter::codec::basetypes::Time::setPrintableString(const char * printableString) throw(anna::RuntimeException) { +void anna::diameter::codec::basetypes::Time::setPrintableString(const char * printableString) noexcept(false) { setTimestamp(atoi(printableString)); } @@ -64,7 +36,7 @@ void anna::diameter::codec::basetypes::Time::setPrintableString(const char * pri //------------------------------------------------------------------------------ //------------------------------------------------------------- Time::asString() //------------------------------------------------------------------------------ -std::string anna::diameter::codec::basetypes::Time::asString() throw(anna::RuntimeException) { +std::string anna::diameter::codec::basetypes::Time::asString() noexcept(false) { std::string result = asPrintableString(); anna::time::Date date; date.storeNtp(a_ntpTimestamp); @@ -76,7 +48,7 @@ std::string anna::diameter::codec::basetypes::Time::asString() throw(anna::Runti //------------------------------------------------------------------------------ //--------------------------------------------------------------- Time::decode() //------------------------------------------------------------------------------ -void anna::diameter::codec::basetypes::Time::decode(const char* buffer, const int size) throw(anna::RuntimeException) { +void anna::diameter::codec::basetypes::Time::decode(const char* buffer, const int size) noexcept(false) { if(!buffer) throw anna::RuntimeException("Time::decode | Null Buffer provided", ANNA_FILE_LOCATION); @@ -95,7 +67,7 @@ void anna::diameter::codec::basetypes::Time::decode(const char* buffer, const in //------------------------------------------------------------------------------ //--------------------------------------------------------- Time::getTimestamp() //------------------------------------------------------------------------------ -anna::U32 anna::diameter::codec::basetypes::Time::getTimestamp(Timestamp::_v timestampType) const throw() { +anna::U32 anna::diameter::codec::basetypes::Time::getTimestamp(Timestamp::_v timestampType) const { return ((timestampType == Timestamp::NTP) ? a_ntpTimestamp : (a_ntpTimestamp - TIMESTAMP_OFFSET_NTP1900_OVER_UNIX1970)); } @@ -103,7 +75,7 @@ anna::U32 anna::diameter::codec::basetypes::Time::getTimestamp(Timestamp::_v tim //------------------------------------------------------------------------------ //--------------------------------------------------------- Time::setTimestamp() //------------------------------------------------------------------------------ -void anna::diameter::codec::basetypes::Time::setTimestamp(const U32& timestamp, Timestamp::_v timestampType) throw() { +void anna::diameter::codec::basetypes::Time::setTimestamp(const U32& timestamp, Timestamp::_v timestampType) { a_ntpTimestamp = (timestampType == Timestamp::NTP) ? timestamp : (timestamp + TIMESTAMP_OFFSET_NTP1900_OVER_UNIX1970); updateBasic(); }