Commit 9aa329a7 authored by ml's avatar ml

*** empty log message ***

parent 7bd0340c
......@@ -16,7 +16,7 @@ wb_adrep *wb_adrep::ref()
}
wb_adrep::wb_adrep( wb_orepdbs& o): m_nRef(0), m_orep(&o), m_sts(LDH__SUCCESS),
m_bufferClass(pwr_eClass__)
m_subClass(pwr_eClass__)
{
m_orep->ref();
......@@ -112,7 +112,7 @@ wb_adrep::wb_adrep( wb_orepdbs& o): m_nRef(0), m_orep(&o), m_sts(LDH__SUCCESS),
m_flags = attr.Info.Flags;
m_flags |= PWR_MASK_BUFFER;
m_tid = 0;
m_bufferClass = attr.Class;
m_subClass = attr.Class;
break;
}
......
......@@ -25,7 +25,7 @@ class wb_adrep
int m_flags;
pwr_tTid m_tid;
pwr_tPgmName m_pgmname;
pwr_eClass m_bufferClass;
pwr_tCid m_subClass;
friend class wb_bdrep;
friend class wb_cdrep;
......@@ -55,7 +55,7 @@ class wb_adrep
pwr_eBix bix();
int flags() {return m_flags;}
pwr_tOid boid();
pwr_eClass bufferClass() { return m_bufferClass;}
pwr_tCid subClass() { return m_subClass;}
const char *name() const;
wb_name longName();
......
......@@ -137,7 +137,7 @@ wb_attribute::wb_attribute(wb_attribute& pa, int idx, const char* aname) :
if (!(pa.m_flags & PWR_MASK_BUFFER))
throw wb_error_str("Only $Buffer is supported as sub class");
cid = pa.bufferClass();
cid = pa.subClass();
m_orep = pa.m_orep;
wb_cdrep *cd = m_orep->vrep()->merep()->cdrep(&m_sts, cid);
......@@ -282,6 +282,7 @@ int wb_attribute::flags()
pwr_tAix wb_attribute::aix()
{
throw wb_error_str("wb_attribute::aix() NYI");
return 0; // Fix
}
......@@ -293,37 +294,41 @@ pwr_tCid wb_attribute::cid()
pwr_eBix wb_attribute::bix()
{
throw wb_error_str("wb_attribute::bix() NYI");
throw wb_error_str("wb_attribute::bix() NYI");
return pwr_eBix__; // Fix
}
pwr_tOid wb_attribute::boid()
{
throw wb_error_str("wb_attribute::boid() NYI");
pwr_tOid oid;
return oid; // Fix
}
pwr_eClass wb_attribute::bufferClass()
pwr_tCid wb_attribute::subClass()
{
// This is not recursive for subclasses
if ( m_adrep)
return m_adrep->bufferClass();
return pwr_eClass__;
return m_adrep->subClass();
return 0;
}
bool wb_attribute::checkXref()
{
throw wb_error_str("wb_attribute::checkXref() NYI");
return true; // Fix
}
pwr_sAttrXRef *wb_attribute::xref()
{
throw wb_error_str("wb_attribute::xref() NYI");
return (pwr_sAttrXRef*)0; // Fix
}
pwr_sObjXRef *wb_attribute::oxref()
{
throw wb_error_str("wb_attribute::oxref() NYI");
return (pwr_sObjXRef*)0; // Fix
}
......@@ -353,21 +358,23 @@ void *wb_attribute::value(void *vp, size_t size, pwr_tStatus *sts)
string wb_attribute::toString()
{
string a;
return a;
throw wb_error_str("wb_attribute::toString() NYI");
string a;
return a;
}
pwr_tStatus wb_attribute::fromString(string)
{
pwr_tStatus sts;
return sts;
throw wb_error_str("wb_attribute::fromString() NYI");
pwr_tStatus sts;
return sts;
}
pwr_tStatus wb_attribute::fromString(char *)
{
pwr_tStatus sts;
return sts;
throw wb_error_str("wb_attribute::fromString() NYI");
pwr_tStatus sts;
return sts;
}
wb_attribute wb_attribute::after()
......
......@@ -77,7 +77,7 @@ public:
bool checkXref();
pwr_sAttrXRef *xref();
pwr_sObjXRef *oxref();
pwr_eClass bufferClass();
pwr_tCid subClass();
void *value( void *p = 0);
void *value(void *vp, size_t size, pwr_tStatus*);
......
......@@ -595,7 +595,7 @@ ldh_GetObjectBuffer(ldh_tSession session, pwr_tOid oid, char *bname,
*size = a.size();
a.value( *value);
*bufferclass = a.bufferClass();
*bufferclass = (pwr_eClass)a.subClass();
return LDH__SUCCESS;
}
......
......@@ -864,7 +864,7 @@ void wb_wblnode::buildBuff( ref_wblnode object, int bix, pwr_tCid buffer_cid,
return;
}
pwr_tCid cid = adrep->bufferClass();
pwr_tCid cid = adrep->subClass();
size = adrep->size();
offset = adrep->offset();
elements = adrep->nElement();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment