Mejora Makefile principal para que compile el viewer también.

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

diff --git a/src/btree_data.cpp b/src/btree_data.cpp
index bf92909969aedf7630105ac8c91fc9db61b52661..70195fdb41e9650fda39faa413e30e883962cde8 100644 (file)
--- a/src/btree_data.cpp
+++ b/src/btree_data.cpp
@@ -24,8 +24,10 @@ BTreeData::BTreeData (Clave *k, uint child)
 
 BTreeData::~BTreeData ()
 {
 
 BTreeData::~BTreeData ()
 {

-       if (clave)
+       if (clave) {

                delete clave;
                delete clave;

+               clave = NULL;
+       }

 }
 
 uint BTreeData::Size () const
 }
 
 uint BTreeData::Size () const


@@ -68,7 +70,7 @@ bool BTreeData::Abrev (BTreeData *anterior)
        if (anterior == NULL) return false;
 
        ClaveVariable *c = (ClaveVariable *)clave;
        if (anterior == NULL) return false;
 
        ClaveVariable *c = (ClaveVariable *)clave;

-       return c->Abrev (dynamic_cast<ClaveVariable *>(anterior->getClave ()));
+       return c->Abrev (dynamic_cast<ClaveVariable *>(anterior->GetKey ()));

 }
 
 bool BTreeData::DesAbrev (BTreeData *anterior)
 }
 
 bool BTreeData::DesAbrev (BTreeData *anterior)


@@ -76,7 +78,7 @@ bool BTreeData::DesAbrev (BTreeData *anterior)
        if (anterior == NULL) return false;
 
        ClaveVariable *c = (ClaveVariable *)clave;
        if (anterior == NULL) return false;
 
        ClaveVariable *c = (ClaveVariable *)clave;

-       return c->DesAbrev (dynamic_cast<ClaveVariable *>(anterior->getClave ()));
+       return c->DesAbrev (dynamic_cast<ClaveVariable *>(anterior->GetKey ()));

 }
 
 BTreeLeafData::BTreeLeafData (uchar *node, int key_type)
 }
 
 BTreeLeafData::BTreeLeafData (uchar *node, int key_type)


@@ -89,6 +91,10 @@ BTreeLeafData::BTreeLeafData (uchar *node, int key_type)
 
 BTreeLeafData::~BTreeLeafData ()
 {
 
 BTreeLeafData::~BTreeLeafData ()
 {

+       if (clave) {
+               delete clave; 
+               clave = NULL;
+       }

 }
 
 uint BTreeLeafData::Size () const
 }
 
 uint BTreeLeafData::Size () const