Change dtmmdb class from tuple to mmdb_tuple

diff --git a/cde/programs/dtinfo/DtMmdb/mgrs/template_mgr.C b/cde/programs/dtinfo/DtMmdb/mgrs/template_mgr.C
index 2820ce09cd3c96019ad20704995f1fd253f793b0..55202079a0257c6000f29bf35f97768f1cbedd36 100644 (file)
--- a/cde/programs/dtinfo/DtMmdb/mgrs/template_mgr.C
+++ b/cde/programs/dtinfo/DtMmdb/mgrs/template_mgr.C
@@ -101,7 +101,7 @@ template_mgr_t::template_mgr_t() : v_template_objs(32801, 20)
    template_obj_table[1] = ::new oid;
    template_obj_table[2] = ::new integer;
    template_obj_table[3] = ::new pstring;
-   template_obj_table[4] = ::new tuple;
+   template_obj_table[4] = ::new mmdb_tuple;
    template_obj_table[5] = ::new oid_list;
    template_obj_table[6] = ::new fast_mphf;
    template_obj_table[7] = ::new inv_lists;

diff --git a/cde/programs/dtinfo/DtMmdb/object/tuple.C b/cde/programs/dtinfo/DtMmdb/object/tuple.C
index 03e84727085ee0c2b97ec3ec8973648815d27a96..101fa2e520784872f9ac31050b0d8c8891aac3cf 100644 (file)
--- a/cde/programs/dtinfo/DtMmdb/object/tuple.C
+++ b/cde/programs/dtinfo/DtMmdb/object/tuple.C
@@ -52,33 +52,33 @@
 
 #define MAX_COMPS 50
 
-tuple::tuple(c_code_t c_cd) : oid_list(c_cd)
+mmdb_tuple::mmdb_tuple(c_code_t c_cd) : oid_list(c_cd)
 {
 }
 
-tuple::tuple(int comps, c_code_t c_cd) : oid_list(comps, c_cd)
+mmdb_tuple::mmdb_tuple(int comps, c_code_t c_cd) : oid_list(comps, c_cd)
 {
 }
 
-tuple::tuple(tuple& x) : oid_list(x)
+mmdb_tuple::mmdb_tuple(mmdb_tuple& x) : oid_list(x)
 {
 }
 
-tuple::~tuple()
+mmdb_tuple::~mmdb_tuple()
 {
 }
 
-handler* tuple::get_component(int index) 
+handler* mmdb_tuple::get_component(int index) 
 {
 
-//MESSAGE(cerr, "in tuple():: get_component()");
+//MESSAGE(cerr, "in mmdb_tuple():: get_component()");
 //debug(cerr, index);
 //debug(cerr, my_oid());
 //debug(cerr, int(storage_ptr));
 
 
    if (!INRANGE(index, 1, (int) v_sz)) {
-      MESSAGE(cerr, "out of range in tuple::get_component()");
+      MESSAGE(cerr, "out of range in mmdb_tuple::get_component()");
       throw( boundaryException(1, v_sz, index) );
    }
 
@@ -97,15 +97,15 @@ handler* tuple::get_component(int index)
    return y;
 }
 
-Boolean tuple::pinned_insert(int index, const oid_t& val) 
+Boolean mmdb_tuple::pinned_insert(int index, const oid_t& val) 
 {
-//MESSAGE(cerr, "in tuple():: pinned_component()");
+//MESSAGE(cerr, "in mmdb_tuple():: pinned_component()");
 //debug(cerr, index);
 //debug(cerr, val);
       return oid_list::update_component(index, val);
 }
 
-io_status tuple::asciiOut(ostream& out) 
+io_status mmdb_tuple::asciiOut(ostream& out) 
 {
    out << "OID_T:\n";
    my_oid().asciiOut(out); 
@@ -130,11 +130,11 @@ io_status tuple::asciiOut(ostream& out)
    return done;
 }
 
-io_status tuple::asciiIn(istream& in)
+io_status mmdb_tuple::asciiIn(istream& in)
 {
 
 /*
-MESSAGE(cerr, "in tuple asciiIn()");
+MESSAGE(cerr, "in mmdb_tuple asciiIn()");
 my_oid().asciiOut(cerr);
 MESSAGE(cerr, "\n");
 */
@@ -155,7 +155,7 @@ MESSAGE(cerr, "\n");
    }
 
    if ( comps > (int) v_sz ) {
-MESSAGE(cerr, "tuple asciiIn(): to expand space");
+MESSAGE(cerr, "mmdb_tuple asciiIn(): to expand space");
 debug(cerr, comps);
 debug(cerr, v_sz);
      oid_list::expand_space(comps - v_sz);
@@ -188,5 +188,5 @@ debug(cerr, v_sz);
    return done;
 }
 
-MMDB_BODIES(tuple)
-HANDLER_BODIES(tuple)
+MMDB_BODIES(mmdb_tuple)
+HANDLER_BODIES(mmdb_tuple)

diff --git a/cde/programs/dtinfo/DtMmdb/object/tuple.h b/cde/programs/dtinfo/DtMmdb/object/tuple.h
index f272497d4d2656a7a976cc27d89d71ccdd1db920..08d5d70fea3e433b44ac0abb335e02e72ec5ad74 100644 (file)
--- a/cde/programs/dtinfo/DtMmdb/object/tuple.h
+++ b/cde/programs/dtinfo/DtMmdb/object/tuple.h
@@ -48,8 +48,8 @@
  */
 
 
-#ifndef _tuple_h
-#define _tuple_h 1
+#ifndef _mmdb_tuple_h
+#define _mmdb_tuple_h 1
 
 #include "object/oid_list.h"
 
@@ -57,17 +57,17 @@
 * tuple class.
 ****************************************/
 
-class tuple: public oid_list
+class mmdb_tuple: public oid_list
 {
 protected:
 
 public:
-   tuple(c_code_t = TUPLE_CODE);
-   tuple(int num_comps, c_code_t);
-   tuple(tuple&);
-   virtual ~tuple();
+   mmdb_tuple(c_code_t = TUPLE_CODE);
+   mmdb_tuple(int num_comps, c_code_t);
+   mmdb_tuple(mmdb_tuple&);
+   virtual ~mmdb_tuple();
 
-   MMDB_SIGNATURES(tuple);
+   MMDB_SIGNATURES(mmdb_tuple);
 
 /*
 // value comparison functions
@@ -87,6 +87,6 @@ public:
    virtual io_status asciiIn(istream&) ;
 };
    
-HANDLER_SIGNATURES(tuple)
+HANDLER_SIGNATURES(mmdb_tuple)
    
 #endif

diff --git a/cde/programs/dtinfo/DtMmdb/oliasdb/doc_hd.h b/cde/programs/dtinfo/DtMmdb/oliasdb/doc_hd.h
index fb76f711c0da1d0f2e2ab1dbcbddfd8d8477e37f..d3829f4a3c7bd0301aae256e4a956f2b6891c760 100644 (file)
--- a/cde/programs/dtinfo/DtMmdb/oliasdb/doc_hd.h
+++ b/cde/programs/dtinfo/DtMmdb/oliasdb/doc_hd.h
@@ -67,10 +67,10 @@
 // The doc class
 /*************************************/
 
-class doc : public tuple
+class doc : public mmdb_tuple
 {
 public:
-   doc() : tuple(NUM_DOC_FIELDS, DOC_CODE) {};
+   doc() : mmdb_tuple(NUM_DOC_FIELDS, DOC_CODE) {};
    virtual ~doc() {};
 
    MMDB_SIGNATURES(doc);

diff --git a/cde/programs/dtinfo/DtMmdb/oliasdb/graphic_hd.h b/cde/programs/dtinfo/DtMmdb/oliasdb/graphic_hd.h
index 1a8f4fa091ace998c226fc493700a04854b3cca8..6e25e04a52653d810488cf3d6f244a9729ff7a93 100644 (file)
--- a/cde/programs/dtinfo/DtMmdb/oliasdb/graphic_hd.h
+++ b/cde/programs/dtinfo/DtMmdb/oliasdb/graphic_hd.h
@@ -62,11 +62,11 @@
 // The graphic class
 /*************************************/
 
-class graphic : public tuple
+class graphic : public mmdb_tuple
 {
 
 public:
-   graphic() : tuple(NUM_GRAPHIC_FIELDS, GRAPHIC_CODE) {};
+   graphic() : mmdb_tuple(NUM_GRAPHIC_FIELDS, GRAPHIC_CODE) {};
    virtual ~graphic() {};
 
    MMDB_SIGNATURES(graphic);

diff --git a/cde/programs/dtinfo/DtMmdb/oliasdb/locator_hd.C b/cde/programs/dtinfo/DtMmdb/oliasdb/locator_hd.C
index 22dc78a2e48d65899193a1542a22a2eb3f9de7a6..b40d425551bea4a79f81630c0e111bd75fbf6d83 100644 (file)
--- a/cde/programs/dtinfo/DtMmdb/oliasdb/locator_hd.C
+++ b/cde/programs/dtinfo/DtMmdb/oliasdb/locator_hd.C
@@ -52,7 +52,7 @@
 
 MMDB_BODIES(olias_locator)
 
-olias_locator::olias_locator() : tuple(2, LOCATOR_CODE) 
+olias_locator::olias_locator() : mmdb_tuple(2, LOCATOR_CODE) 
 {
 }
 

diff --git a/cde/programs/dtinfo/DtMmdb/oliasdb/locator_hd.h b/cde/programs/dtinfo/DtMmdb/oliasdb/locator_hd.h
index 5e20fbb5b4dbfba81ad3247346fb9d7dd95bd736..97ccd0aae6538401d09c9bd40dfbb9dda7a663e2 100644 (file)
--- a/cde/programs/dtinfo/DtMmdb/oliasdb/locator_hd.h
+++ b/cde/programs/dtinfo/DtMmdb/oliasdb/locator_hd.h
@@ -63,7 +63,7 @@
 // The locator class
 /*************************************/
 
-class olias_locator : public tuple
+class olias_locator : public mmdb_tuple
 {
 
 public:

diff --git a/cde/programs/dtinfo/DtMmdb/oliasdb/mark.C b/cde/programs/dtinfo/DtMmdb/oliasdb/mark.C
index ffc0f0bf7191510515e86b1407879b8d389f6b69..b7d7357153ac7397024617b84d6cdf2c88986808 100644 (file)
--- a/cde/programs/dtinfo/DtMmdb/oliasdb/mark.C
+++ b/cde/programs/dtinfo/DtMmdb/oliasdb/mark.C
@@ -51,7 +51,7 @@
 
 #include "oliasdb/mark.h"
 
-umark::umark() : tuple(2, USER_MARK_CODE) 
+umark::umark() : mmdb_tuple(2, USER_MARK_CODE) 
 {
 }
 
@@ -80,7 +80,7 @@ debug(cerr, node_locator);
    // init tuple part
    /////////////////////
 
-      tuple_handler* x = (tuple_handler*)
+      mmdb_tuple_handler* x = (mmdb_tuple_handler*)
         (new handler(USER_MARK_CODE, marks_store));
 
    

diff --git a/cde/programs/dtinfo/DtMmdb/oliasdb/mark.h b/cde/programs/dtinfo/DtMmdb/oliasdb/mark.h
index e4d6472d053861abf79ac24947d3f64f5126c24e..043729f784e5027aba96e2120a22640f50530b2e 100644 (file)
--- a/cde/programs/dtinfo/DtMmdb/oliasdb/mark.h
+++ b/cde/programs/dtinfo/DtMmdb/oliasdb/mark.h
@@ -62,7 +62,7 @@
 #define mark_smart_ptr user_mark_smart_ptr
 #define umark user_mark
 
-class umark : public tuple
+class umark : public mmdb_tuple
 {
 
 public:

diff --git a/cde/programs/dtinfo/DtMmdb/oliasdb/node_hd.h b/cde/programs/dtinfo/DtMmdb/oliasdb/node_hd.h
index a37b99c4e39f76a2ee47f75531b0dc27d38dc862..450f0ace42def7fe73bc165e3abf994f7f67e191 100644 (file)
--- a/cde/programs/dtinfo/DtMmdb/oliasdb/node_hd.h
+++ b/cde/programs/dtinfo/DtMmdb/oliasdb/node_hd.h
@@ -67,11 +67,11 @@
 // The node class
 /*************************************/
 
-class olias_node : public tuple
+class olias_node : public mmdb_tuple
 {
 
 public:
-   olias_node() : tuple(NUM_OLIAS_NODE_FIELDS, OLIAS_NODE_CODE) {};
+   olias_node() : mmdb_tuple(NUM_OLIAS_NODE_FIELDS, OLIAS_NODE_CODE) {};
    virtual ~olias_node() {};
 
    MMDB_SIGNATURES(olias_node);

diff --git a/cde/programs/dtinfo/DtMmdb/oliasdb/pref.h b/cde/programs/dtinfo/DtMmdb/oliasdb/pref.h
index f3aa0e3334ee4892b071da6851eef6c102c21b1a..b5e08b68f3003466cfecc2b07b26a152db23b289 100644 (file)
--- a/cde/programs/dtinfo/DtMmdb/oliasdb/pref.h
+++ b/cde/programs/dtinfo/DtMmdb/oliasdb/pref.h
@@ -67,10 +67,10 @@
 #endif
 
 
-class pref : public tuple 
+class pref : public mmdb_tuple 
 {
 public:
-   pref() : tuple(2, USER_CONFIG_CODE) {};
+   pref() : mmdb_tuple(2, USER_CONFIG_CODE) {};
    virtual ~pref() {};
 
    MMDB_SIGNATURES(pref);

diff --git a/cde/programs/dtinfo/DtMmdb/oliasdb/stylesheet_hd.h b/cde/programs/dtinfo/DtMmdb/oliasdb/stylesheet_hd.h
index a3f5a5c1117b0db5cb52c887af335ead86560807..f95c53ffa8f7ef42aa8fa2f547270a9dddf5372d 100644 (file)
--- a/cde/programs/dtinfo/DtMmdb/oliasdb/stylesheet_hd.h
+++ b/cde/programs/dtinfo/DtMmdb/oliasdb/stylesheet_hd.h
@@ -62,11 +62,11 @@
 // The stylesheet class
 /*************************************/
 
-class stylesheet : public tuple
+class stylesheet : public mmdb_tuple
 {
 
 public:
-   stylesheet() : tuple(NUM_STYLESHEET_FIELDS, STYLESHEET_CODE) {};
+   stylesheet() : mmdb_tuple(NUM_STYLESHEET_FIELDS, STYLESHEET_CODE) {};
    virtual ~stylesheet() {};
 
    MMDB_SIGNATURES(stylesheet);

diff --git a/cde/programs/dtinfo/DtMmdb/oliasdb/toc_hd.h b/cde/programs/dtinfo/DtMmdb/oliasdb/toc_hd.h
index 5f83c5964340f8c5b0ea2d123234dc687a6d7da4..efe187d9ee5ad3e573d0a28f6495875fb9335f5c 100644 (file)
--- a/cde/programs/dtinfo/DtMmdb/oliasdb/toc_hd.h
+++ b/cde/programs/dtinfo/DtMmdb/oliasdb/toc_hd.h
@@ -63,11 +63,11 @@
 // The toc class
 /*************************************/
 
-class toc : public tuple
+class toc : public mmdb_tuple
 {
 
 public:
-   toc() : tuple(NUM_TOC_FIELDS, TOC_CODE) {};
+   toc() : mmdb_tuple(NUM_TOC_FIELDS, TOC_CODE) {};
    virtual ~toc() {};
 
    MMDB_SIGNATURES(toc);