tagged 1.1

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

diff --git a/src/btree_data.h b/src/btree_data.h
index 53af1fc9c62f35764d320d7d892e6e701a87b9eb..b7f457ac2a903731c1bc1665c9f8675e6a164acd 100644 (file)
--- a/src/btree_data.h
+++ b/src/btree_data.h
@@ -61,10 +61,10 @@ class BTreeData {
                virtual operator std::string () const {
                        std::string out = (*clave);
                        std::stringstream ss;
                virtual operator std::string () const {
                        std::string out = (*clave);
                        std::stringstream ss;

-                       ss << "(" << out ;
+                       ss << "(";
+                       ss << out;

                        ss << ")" << "[" << hijo << "]";
                        ss << ")" << "[" << hijo << "]";

-                       ss >> out;
-                       return out;
+                       return ss.str ();

                }
        protected:
                Clave *clave;
                }
        protected:
                Clave *clave;


@@ -74,7 +74,7 @@ class BTreeData {
 /** Dato a guardar en las hojas */
 class BTreeLeafData:public BTreeData {
        public:
 /** Dato a guardar en las hojas */
 class BTreeLeafData:public BTreeData {
        public:

-               BTreeLeafData (Clave *k) { clave = k; }
+               BTreeLeafData (Clave *k) { clave = k; hijo = 0; }

                BTreeLeafData (uchar *node, int key_type);
                virtual ~BTreeLeafData ();
 
                BTreeLeafData (uchar *node, int key_type);
                virtual ~BTreeLeafData ();
 


@@ -96,6 +96,7 @@ class BTreeChildData:public BTreeData {
 
                virtual uint Size () const;
                virtual uchar *ToArray () const;
 
                virtual uint Size () const;
                virtual uchar *ToArray () const;

+               bool operator < (const BTreeData &data) const;

                virtual operator std::string () const {
                        std::string out;
                        std::stringstream ss;
                virtual operator std::string () const {
                        std::string out;
                        std::stringstream ss;