UNDO: Cambio constructor por metodo estatico.

[z.facultad/75.52/treemulator.git] / src / clave_fija.cpp

diff --git a/src/clave_fija.cpp b/src/clave_fija.cpp
index 71f6f0d5d99847bb84e07a5d1922ee8faef57c28..ea8c09e6763f8f42db9ae4f4feaa256b37c2e473 100644 (file)
--- a/src/clave_fija.cpp
+++ b/src/clave_fija.cpp
@@ -2,10 +2,9 @@
 #include <string>
 #include "clave_fija.h"
 
 #include <string>
 #include "clave_fija.h"
 

-ClaveFija::ClaveFija (int n, uint bd)
+ClaveFija::ClaveFija (int n)

 {
        data = n;
 {
        data = n;

-       block_data = bd;

 }
 
 ClaveFija::ClaveFija (uchar *n)
 }
 
 ClaveFija::ClaveFija (uchar *n)


@@ -46,7 +45,21 @@ bool ClaveFija::operator == (const Clave &c) const
                
 uchar *ClaveFija::ToRaw (uint &size) const
 {
                
 uchar *ClaveFija::ToRaw (uint &size) const
 {

-       size = Size ();
-       return ToArray ();
+       std::stringstream ss;
+
+       ss << "[";
+       ss << data;
+       ss << "]";
+       ss << "[";
+       ss << block_data;
+       ss << "]";
+
+       std::string s = ss.str ();
+
+       uchar *out = new uchar[s.size ()];
+       memcpy (out, s.c_str (), s.size ());
+
+       size = s.size ();
+       return out;

 }
 
 }