X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=source%2Fcore%2FDataBlock.cpp;h=4d69d59a96748a9fdd0f5fda5c17876a2520858d;hb=5a6cba5fde2b2f538a7515f8293cc0a8d9589dfa;hp=e7e00e1626c9a72eea8ed49a64788a7510b0563e;hpb=39033fd99e58e994a5e98c1060dcc79e0d81f9c9;p=anna.git diff --git a/source/core/DataBlock.cpp b/source/core/DataBlock.cpp index e7e00e1..4d69d59 100644 --- a/source/core/DataBlock.cpp +++ b/source/core/DataBlock.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 @@ -48,7 +20,7 @@ using namespace anna; if ((a_size + (a)) >= a_maxSize) extend ((a)); DataBlock::DataBlock(const char* buffer, const int size, const bool deepCopy) -throw(RuntimeException) : +noexcept(false) : a_buffer(NULL), a_size(0), a_deepCopy(deepCopy), @@ -57,7 +29,7 @@ throw(RuntimeException) : } DataBlock::DataBlock(const DataBlock& other) -throw(RuntimeException) : +noexcept(false) : a_buffer(NULL), a_size(0), a_deepCopy(other.a_deepCopy), @@ -71,7 +43,7 @@ DataBlock::~DataBlock() { } void DataBlock::initialize(const char* buffer, const int size) -throw(RuntimeException) { +noexcept(false) { if(a_deepCopy == false) { a_buffer = const_cast (buffer); a_size = size; @@ -87,7 +59,7 @@ throw(RuntimeException) { } void DataBlock::setSize(const int size) -throw(RuntimeException) { +noexcept(false) { // if (size > a_maxSize) { // string msg ("DataBlock::setSize | MaxSize: "); // msg += functions::asString (a_maxSize); @@ -107,7 +79,7 @@ throw(RuntimeException) { } void DataBlock::allocate(const int nbytes) -throw(RuntimeException) { +noexcept(false) { if(nbytes > a_size) { if(a_maxSize == 0) { if(a_deepCopy == false) @@ -123,7 +95,7 @@ throw(RuntimeException) { } void DataBlock::assign(const char* buffer, const int size) -throw(RuntimeException) { +noexcept(false) { if(a_deepCopy == false) { a_buffer = const_cast (buffer); a_size = size; @@ -135,7 +107,7 @@ throw(RuntimeException) { } DataBlock& DataBlock::operator = (const DataBlock & right) -throw(RuntimeException) { +noexcept(false) { if(this != &right) { if(a_deepCopy) { a_size = 0; @@ -150,7 +122,7 @@ throw(RuntimeException) { } const char DataBlock::operator [](const int pos) const -throw(RuntimeException) { +noexcept(false) { if(pos >= a_size) { std::string msg("Position: "); msg += functions::asString(pos); @@ -164,7 +136,7 @@ throw(RuntimeException) { } char& DataBlock::operator [](const int pos) -throw(RuntimeException) { +noexcept(false) { if(pos >= a_size) { std::string msg("Position: "); msg += functions::asString(pos); @@ -179,13 +151,13 @@ throw(RuntimeException) { } void DataBlock::append(const char* data, const int len) -throw(RuntimeException) { +noexcept(false) { if(a_buffer == data && data != NULL && len > 0) throw RuntimeException("Can not append myself", ANNA_FILE_LOCATION); if((a_size + len) >= a_maxSize) extend(len); - register char* w = a_buffer + a_size; + char* w = a_buffer + a_size; switch(len) { case 0: break; @@ -198,7 +170,7 @@ throw(RuntimeException) { } void DataBlock::remove(const int pos, const int nbytes) -throw(RuntimeException) { +noexcept(false) { if(a_deepCopy == false) throw RuntimeException("Deep copy not activated", ANNA_FILE_LOCATION); @@ -217,7 +189,7 @@ throw(RuntimeException) { } void DataBlock::remove(const int nbytes) -throw(RuntimeException) { +noexcept(false) { if(a_deepCopy == false) throw RuntimeException("Deep copy not activated", ANNA_FILE_LOCATION); @@ -236,7 +208,7 @@ throw(RuntimeException) { } void DataBlock::extend(const int nbytes) -throw(RuntimeException) { +noexcept(false) { if(a_deepCopy == false) throw RuntimeException("Deep copy not activated", ANNA_FILE_LOCATION); @@ -258,8 +230,8 @@ throw(RuntimeException) { } std::string DataBlock::asString(const int characterByLine) const -throw() { - char aux [8]; +{ + char aux [16]; std::string numbers; std::string characters; unsigned char c;