Remove core-comm dependency through CounterManager/timex in core/oam subsystem. Basic...

[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..db6a23c 100644 (file)
--- a/include/anna/core/util/String.hpp
+++ b/include/anna/core/util/String.hpp
@@ -41,7 +41,7 @@
 
 #include <stdio.h>
 
-#include <anna/config/defines.hpp>
+#include <anna/core/util/defines.hpp>
 
 namespace anna {
 
@@ -103,8 +103,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 +114,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 +125,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 +177,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");