debian/cdesktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects 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
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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)

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

@@ -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