Merge pull request #6555 from wmtan/PassAddressOfPointer

Pass address of pointer, not value, again
cms-sw · Nov 21, 2014 · 58e04eb · 58e04eb
2 parents edd3ecf + efe0665
commit 58e04eb
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/CondCore/ORA/src/OraPtrStreamer.cc b/CondCore/ORA/src/OraPtrStreamer.cc
@@ -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 );
 }
 

diff --git a/CondCore/ORA/src/QueryableVectorStreamer.cc b/CondCore/ORA/src/QueryableVectorStreamer.cc
@@ -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 );
 }