external/cde
1
0
Fork 0
mirror of git://git.code.sf.net/p/cdesktopenv/code synced 2025-02-15 04:32:24 +00:00
Code Issues Releases Wiki Activity

Change dtmmdb class from tuple to mmdb_tuple

Browse source
This commit is contained in:
Peter Howkins 2018-03-21 01:03:31 +00:00
parent abd209a83c
commit b1c3729e88
13 changed files with 42 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cde/programs/dtinfo/DtMmdb/mgrs/template_mgr.C
View file

@ -101,7 +101,7 @@ template_mgr_t::template_mgr_t() : v_template_objs(32801, 20)
template_obj_table[1] = ::new oid; template_obj_table[1] = ::new oid;
template_obj_table[2] = ::new integer; template_obj_table[2] = ::new integer;
template_obj_table[3] = ::new pstring; 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[5] = ::new oid_list;
template_obj_table[6] = ::new fast_mphf; template_obj_table[6] = ::new fast_mphf;
template_obj_table[7] = ::new inv_lists; template_obj_table[7] = ::new inv_lists;

30
cde/programs/dtinfo/DtMmdb/object/tuple.C
View file

@ -52,33 +52,33 @@
#define MAX_COMPS 50 #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, index);
//debug(cerr, my_oid()); //debug(cerr, my_oid());
//debug(cerr, int(storage_ptr)); //debug(cerr, int(storage_ptr));
if (!INRANGE(index, 1, (int) v_sz)) { 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) ); throw( boundaryException(1, v_sz, index) );
} }
@ -97,15 +97,15 @@ handler* tuple::get_component(int index)
return y; 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, index);
//debug(cerr, val); //debug(cerr, val);
return oid_list::update_component(index, 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"; out << "OID_T:\n";
my_oid().asciiOut(out); my_oid().asciiOut(out);
@ -130,11 +130,11 @@ io_status tuple::asciiOut(ostream& out)
return done; 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); my_oid().asciiOut(cerr);
MESSAGE(cerr, "\n"); MESSAGE(cerr, "\n");
*/ */
@ -155,7 +155,7 @@ MESSAGE(cerr, "\n");
} }
if ( comps > (int) v_sz ) { 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, comps);
debug(cerr, v_sz); debug(cerr, v_sz);
oid_list::expand_space(comps - v_sz); oid_list::expand_space(comps - v_sz);
@ -188,5 +188,5 @@ debug(cerr, v_sz);
return done; return done;
} }
MMDB_BODIES(tuple) MMDB_BODIES(mmdb_tuple)
HANDLER_BODIES(tuple) HANDLER_BODIES(mmdb_tuple)

18
cde/programs/dtinfo/DtMmdb/object/tuple.h
View file

@ -48,8 +48,8 @@
*/ */
#ifndef _tuple_h #ifndef _mmdb_tuple_h
#define _tuple_h 1 #define _mmdb_tuple_h 1
#include "object/oid_list.h" #include "object/oid_list.h"
@ -57,17 +57,17 @@
* tuple class. * tuple class.
****************************************/ ****************************************/
class tuple: public oid_list class mmdb_tuple: public oid_list
{ {
protected: protected:
public: public:
tuple(c_code_t = TUPLE_CODE); mmdb_tuple(c_code_t = TUPLE_CODE);
tuple(int num_comps, c_code_t); mmdb_tuple(int num_comps, c_code_t);
tuple(tuple&); mmdb_tuple(mmdb_tuple&);
virtual ~tuple(); virtual ~mmdb_tuple();
MMDB_SIGNATURES(tuple); MMDB_SIGNATURES(mmdb_tuple);
/* /*
// value comparison functions // value comparison functions
@ -87,6 +87,6 @@ public:
virtual io_status asciiIn(istream&) ; virtual io_status asciiIn(istream&) ;
}; };
HANDLER_SIGNATURES(tuple) HANDLER_SIGNATURES(mmdb_tuple)
#endif #endif

4
cde/programs/dtinfo/DtMmdb/oliasdb/doc_hd.h
View file

@ -67,10 +67,10 @@
// The doc class // The doc class
/*************************************/ /*************************************/
class doc : public tuple class doc : public mmdb_tuple
{ {
public: public:
doc() : tuple(NUM_DOC_FIELDS, DOC_CODE) {}; doc() : mmdb_tuple(NUM_DOC_FIELDS, DOC_CODE) {};
virtual ~doc() {}; virtual ~doc() {};
MMDB_SIGNATURES(doc); MMDB_SIGNATURES(doc);

4
cde/programs/dtinfo/DtMmdb/oliasdb/graphic_hd.h
View file

@ -62,11 +62,11 @@
// The graphic class // The graphic class
/*************************************/ /*************************************/
class graphic : public tuple class graphic : public mmdb_tuple
{ {
public: public:
graphic() : tuple(NUM_GRAPHIC_FIELDS, GRAPHIC_CODE) {}; graphic() : mmdb_tuple(NUM_GRAPHIC_FIELDS, GRAPHIC_CODE) {};
virtual ~graphic() {}; virtual ~graphic() {};
MMDB_SIGNATURES(graphic); MMDB_SIGNATURES(graphic);

2
cde/programs/dtinfo/DtMmdb/oliasdb/locator_hd.C
View file

@ -52,7 +52,7 @@
MMDB_BODIES(olias_locator) MMDB_BODIES(olias_locator)
olias_locator::olias_locator() : tuple(2, LOCATOR_CODE) olias_locator::olias_locator() : mmdb_tuple(2, LOCATOR_CODE)
{ {
} }

2
cde/programs/dtinfo/DtMmdb/oliasdb/locator_hd.h
View file

@ -63,7 +63,7 @@
// The locator class // The locator class
/*************************************/ /*************************************/
class olias_locator : public tuple class olias_locator : public mmdb_tuple
{ {
public: public:

4
cde/programs/dtinfo/DtMmdb/oliasdb/mark.C
View file

@ -51,7 +51,7 @@
#include "oliasdb/mark.h" #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 // init tuple part
///////////////////// /////////////////////
tuple_handler* x = (tuple_handler*) mmdb_tuple_handler* x = (mmdb_tuple_handler*)
(new handler(USER_MARK_CODE, marks_store)); (new handler(USER_MARK_CODE, marks_store));

2
cde/programs/dtinfo/DtMmdb/oliasdb/mark.h
View file

@ -62,7 +62,7 @@
#define mark_smart_ptr user_mark_smart_ptr #define mark_smart_ptr user_mark_smart_ptr
#define umark user_mark #define umark user_mark
class umark : public tuple class umark : public mmdb_tuple
{ {
public: public:

4
cde/programs/dtinfo/DtMmdb/oliasdb/node_hd.h
View file

@ -67,11 +67,11 @@
// The node class // The node class
/*************************************/ /*************************************/
class olias_node : public tuple class olias_node : public mmdb_tuple
{ {
public: 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() {}; virtual ~olias_node() {};
MMDB_SIGNATURES(olias_node); MMDB_SIGNATURES(olias_node);

4
cde/programs/dtinfo/DtMmdb/oliasdb/pref.h
View file

@ -67,10 +67,10 @@
#endif #endif
class pref : public tuple class pref : public mmdb_tuple
{ {
public: public:
pref() : tuple(2, USER_CONFIG_CODE) {}; pref() : mmdb_tuple(2, USER_CONFIG_CODE) {};
virtual ~pref() {}; virtual ~pref() {};
MMDB_SIGNATURES(pref); MMDB_SIGNATURES(pref);

4
cde/programs/dtinfo/DtMmdb/oliasdb/stylesheet_hd.h
View file

@ -62,11 +62,11 @@
// The stylesheet class // The stylesheet class
/*************************************/ /*************************************/
class stylesheet : public tuple class stylesheet : public mmdb_tuple
{ {
public: public:
stylesheet() : tuple(NUM_STYLESHEET_FIELDS, STYLESHEET_CODE) {}; stylesheet() : mmdb_tuple(NUM_STYLESHEET_FIELDS, STYLESHEET_CODE) {};
virtual ~stylesheet() {}; virtual ~stylesheet() {};
MMDB_SIGNATURES(stylesheet); MMDB_SIGNATURES(stylesheet);

4
cde/programs/dtinfo/DtMmdb/oliasdb/toc_hd.h
View file

@ -63,11 +63,11 @@
// The toc class // The toc class
/*************************************/ /*************************************/
class toc : public tuple class toc : public mmdb_tuple
{ {
public: public:
toc() : tuple(NUM_TOC_FIELDS, TOC_CODE) {}; toc() : mmdb_tuple(NUM_TOC_FIELDS, TOC_CODE) {};
virtual ~toc() {}; virtual ~toc() {};
MMDB_SIGNATURES(toc); MMDB_SIGNATURES(toc);