X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=source%2Fcore%2Futil%2FZBlock.cpp;h=c569f5e663890128c0b0950d5da7dfd5963c7268;hb=5a6cba5fde2b2f538a7515f8293cc0a8d9589dfa;hp=73761e231daa7d5ed60ab3653df32e7042ec621a;hpb=3e258840b15577cb8bda3cdedd0b9b88e16404b3;p=anna.git

diff --git a/source/core/util/ZBlock.cpp b/source/core/util/ZBlock.cpp
index 73761e2..c569f5e 100644
--- a/source/core/util/ZBlock.cpp
+++ b/source/core/util/ZBlock.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 <arpa/inet.h>
@@ -48,7 +20,7 @@ using namespace anna;
  * <int que indica el tamaño original del buffer> + buffer comprimido.
  */
 const DataBlock& ZBlock::compress(const DataBlock& data, const Mode::_v mode)
-throw(RuntimeException) {
+noexcept(false) {
   if(&data == this)
     throw RuntimeException("ZBlock::compress | Source and target object cannot be the same", ANNA_FILE_LOCATION);
 
@@ -70,7 +42,7 @@ throw(RuntimeException) {
   DataBlock::allocate(maxSize);
   char* buffer = (char*) DataBlock::getData();
   int aux = htonl(originalSize);
-  register char* w((char*) &aux);
+  char* w((char*) &aux);
   /* Establece el tamaño original del buffer */
   buffer [0] = *w;
   buffer [1] = *(w + 1);
@@ -94,7 +66,7 @@ throw(RuntimeException) {
 }
 
 const DataBlock& ZBlock::uncompress(const DataBlock& zdata)
-throw(RuntimeException) {
+noexcept(false) {
   if(&zdata == this)
     throw RuntimeException("ZBlock::uncompress | Source and target object cannot be the same", ANNA_FILE_LOCATION);
 
@@ -109,7 +81,7 @@ throw(RuntimeException) {
   char* buffer = (char*) zdata.getData();
   int aux;
   uLong size;
-  register char* w((char*) &aux);
+  char* w((char*) &aux);
   *w  = *buffer;
   *(w + 1) = *(buffer + 1);
   *(w + 2) = *(buffer + 2);