Remove warnings (work package 1)

[anna.git] / include / anna / core / util / String.hpp

diff --git a/include/anna/core/util/String.hpp b/include/anna/core/util/String.hpp
index 9e20a36..49126b8 100644 (file)
--- a/include/anna/core/util/String.hpp
+++ b/include/anna/core/util/String.hpp
@@ -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 //
 
 
 #ifndef anna_core_util_String_hpp
@@ -41,7 +13,7 @@
 
 #include <stdio.h>
 
-#include <anna/config/defines.hpp>
+#include <anna/core/util/defines.hpp>
 
 namespace anna {
 
@@ -103,8 +75,8 @@ public:
   String& operator = (const int vv) throw() { std::string::clear(); return operator<< (vv); }
   String& operator = (const unsigned int vv) throw() { std::string::clear(); return operator<< (vv); }
   String& operator = (const bool vv) throw() { std::string::clear(); return operator<< (vv); }
-  String& operator = (const Integer64 vv) throw() { std::string::clear(); return operator<< (vv); }
-  String& operator = (const Unsigned64 vv) throw() { std::string::clear(); return operator<< (vv); }
+  String& operator = (const S64 vv) throw() { std::string::clear(); return operator<< (vv); }
+  String& operator = (const U64 vv) throw() { std::string::clear(); return operator<< (vv); }
   String& operator = (const float vv) throw() { std::string::clear(); return operator<< (vv); }
   String& operator = (const double vv) throw() { std::string::clear(); return operator<< (vv); }
   String& operator = (const std::string& vv) throw() { std::string::operator= (vv); return *this; }
@@ -114,8 +86,8 @@ public:
   String& operator += (const int vv) throw() { return operator<< (vv); }
   String& operator += (const unsigned int vv) throw() { return operator<< (vv); }
   String& operator += (const bool vv) throw() { return operator<< (vv); }
-  String& operator += (const Integer64 vv) throw() { return operator<< (vv); }
-  String& operator += (const Unsigned64 vv) throw() { return operator<< (vv); }
+  String& operator += (const S64 vv) throw() { return operator<< (vv); }
+  String& operator += (const U64 vv) throw() { return operator<< (vv); }
   String& operator += (const float vv) throw() { return operator<< (vv); }
   String& operator += (const double vv) throw() { return operator<< (vv); }
   String& operator += (const std::string& vv) throw() { return *this << vv; }
@@ -125,8 +97,8 @@ public:
   String& operator << (const int vv) throw();
   String& operator << (const unsigned int vv) throw();
   String& operator << (const bool vv) throw() { std::string::operator+= ((vv == true) ? "true" : "false"); return *this; }
-  String& operator << (const Integer64 vv) throw();
-  String& operator << (const Unsigned64 vv) throw();
+  String& operator << (const S64 vv) throw();
+  String& operator << (const U64 vv) throw();
   String& operator << (const float vv) throw();
   String& operator << (const double vv) throw();
   String& operator << (const std::string& vv) throw() { std::string::operator+= (vv); return *this; }
@@ -177,7 +149,7 @@ public:
    * \param vv Valor a interpretar.
    * \return La cadena con el contenido interpretado.
    */
-  static String hex(const Integer64 vv) {
+  static String hex(const S64 vv) {
     return __format(vv, "0x%llx");
     /*#ifdef __anna64__
        return __format (vv, "0x%lx");