summaryrefslogtreecommitdiffstats
path: root/db/mork/src/morkStore.cpp
diff options
context:
space:
mode:
authorMatt A. Tobin <email@mattatobin.com>2019-11-11 01:49:50 -0500
committerMatt A. Tobin <email@mattatobin.com>2019-11-11 01:49:50 -0500
commita081e71becb76a90ba6bd82ceb27ce2e0274ea36 (patch)
tree8ab2a38c09255adbf81d155c3acfe58b6211f38c /db/mork/src/morkStore.cpp
parent64f423eb409bbd77e0c9e59e5cfefdfedb472adc (diff)
downloadUXP-a081e71becb76a90ba6bd82ceb27ce2e0274ea36.tar
UXP-a081e71becb76a90ba6bd82ceb27ce2e0274ea36.tar.gz
UXP-a081e71becb76a90ba6bd82ceb27ce2e0274ea36.tar.lz
UXP-a081e71becb76a90ba6bd82ceb27ce2e0274ea36.tar.xz
UXP-a081e71becb76a90ba6bd82ceb27ce2e0274ea36.zip
Bug 1568095 - Make morkAtom::GetYarn() static.
Tag #1273
Diffstat (limited to 'db/mork/src/morkStore.cpp')
-rw-r--r--db/mork/src/morkStore.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/db/mork/src/morkStore.cpp b/db/mork/src/morkStore.cpp
index 4f689d410..d6e70becd 100644
--- a/db/mork/src/morkStore.cpp
+++ b/db/mork/src/morkStore.cpp
@@ -775,7 +775,7 @@ morkStore::OidToYarn(morkEnv* ev, const mdbOid& inOid, mdbYarn* outYarn)
morkAtomAidMap* map = &atomSpace->mAtomSpace_AtomAids;
atom = map->GetAid(ev, (mork_aid) inOid.mOid_Id);
}
- atom->GetYarn(outYarn); // note this is safe even when atom==nil
+ morkAtom::GetYarn(atom, outYarn);
return ev->Good();
}
@@ -823,10 +823,10 @@ morkStore::TokenToString(morkEnv* ev, mdb_token inToken, mdbYarn* outTokenName)
{
morkBookAtom* atom = 0;
morkAtomSpace* space = mStore_GroundColumnSpace;
- if ( space )
+ if ( space ) {
atom = space->mAtomSpace_AtomAids.GetAid(ev, (mork_aid) inToken);
-
- atom->GetYarn(outTokenName); // note this is safe even when atom==nil
+ }
+ morkAtom::GetYarn(atom, outTokenName);
}
else // token is an "immediate" single byte string representation?
this->SmallTokenToOneByteYarn(ev, inToken, outTokenName);