X-Git-Url: https://git.llucax.com/z.facultad/75.52/treemulator.git/blobdiff_plain/78ac68dcad2dc4582213848e8d1a98e3b16abff1..59b7476481f01388fcfd13492adbba7ef841755c:/src/clave_fija.cpp

diff --git a/src/clave_fija.cpp b/src/clave_fija.cpp
index 5a547eb..71f6f0d 100644
--- a/src/clave_fija.cpp
+++ b/src/clave_fija.cpp
@@ -2,26 +2,29 @@
 #include <string>
 #include "clave_fija.h"
 
-ClaveFija::ClaveFija (int n)
+ClaveFija::ClaveFija (int n, uint bd)
 {
 	data = n;
+	block_data = bd;
 }
 
 ClaveFija::ClaveFija (uchar *n)
 {
 	memcpy (&data, n, sizeof(int));
+	memcpy (&block_data, n+sizeof(int), sizeof(int));
 }
 
 uint ClaveFija::Size () const
 {
-	return sizeof (int);
+	return sizeof (int)+sizeof(uint);
 }
 
 uchar *ClaveFija::ToArray () const
 {
 	uchar *out;
-	out = new uchar[sizeof(int)];
+	out = new uchar[Size ()];
 	memcpy (out, &data, sizeof(int));
+	memcpy (out+sizeof (int), &block_data, sizeof(int));
 	return out;
 }
 
@@ -36,3 +39,14 @@ bool ClaveFija::operator < (const Clave &c) const
 	return data < ((ClaveFija&)c).data;
 }
 
+bool ClaveFija::operator == (const Clave &c) const
+{
+	return data == ((ClaveFija&)c).data;
+}
+		
+uchar *ClaveFija::ToRaw (uint &size) const
+{
+	size = Size ();
+	return ToArray ();
+}
+