Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Pass address of pointer, not value, again #6555

Merged
merged 1 commit into from Nov 21, 2014
Merged

Pass address of pointer, not value, again #6555

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions CondCore/ORA/src/OraPtrStreamer.cc
View file
Open in desktop
Expand Up @@ -259,10 +259,10 @@ void ora::OraPtrUpdater::update( int oid,
}
edm::ObjectWithDict ptrObject( m_objectType, m_dataElement->address( data ) );
// first load if required
ptrObject.typeOf().functionMemberByName("load").invoke(ptrObject,0);
void *ptrAddress = 0;
edm::ObjectWithDict ptrAddrObj = edm::ObjectWithDict( edm::TypeWithDict(typeid(void*)), ptrAddress );
ptrObject.typeOf().functionMemberByName("address").invoke(ptrObject, &ptrAddrObj);
m_objectType.functionMemberByName("load").invoke(ptrObject, nullptr);
void *ptrAddress = nullptr;
edm::ObjectWithDict ptrAddrObj = edm::ObjectWithDict( edm::TypeWithDict(typeid(void*)), &ptrAddress );
m_objectType.functionMemberByName("address").invoke(ptrObject, &ptrAddrObj);
m_updater->update( oid, ptrAddress );
}

Expand Down
8 changes: 4 additions & 4 deletions CondCore/ORA/src/QueryableVectorStreamer.cc
View file
Open in desktop
Expand Up @@ -420,10 +420,10 @@ void ora::QueryableVectorUpdater::update( int oid,
}
void* vectorAddress = m_offset->address( data );
edm::ObjectWithDict vectorObj( m_objectType,const_cast<void*>(vectorAddress));
vectorObj.typeOf().functionMemberByName("load").invoke(vectorObj, 0);
void* storageAddress = 0;
edm::ObjectWithDict storAddObj = edm::ObjectWithDict( edm::TypeWithDict(typeid(void*)), storageAddress );
vectorObj.typeOf().functionMemberByName("storageAddress").invoke(vectorObj, &storAddObj);
m_objectType.functionMemberByName("load").invoke(vectorObj, nullptr);
void* storageAddress = nullptr;
edm::ObjectWithDict storAddObj = edm::ObjectWithDict( edm::TypeWithDict(typeid(void*)), &storageAddress );
m_objectType.functionMemberByName("storageAddress").invoke(vectorObj, &storAddObj);
m_updater.update( oid, storageAddress );
}

Expand Down