Skip to content

Commit

Permalink
Merge pull request cms-sw#25364 from wddgit/returnUniquePtrFromFetchP…
Browse files Browse the repository at this point in the history
…ayload

Return unique_ptr from fetchPayload
  • Loading branch information
cmsbuild committed Dec 7, 2018
2 parents cc5a16d + a2a0b57 commit e0d834d
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions CondCore/CondDB/interface/Session.h
Expand Up @@ -138,7 +138,7 @@ namespace cond {
template <typename T> cond::Hash storePayload( const T& payload,
const boost::posix_time::ptime& creationTime = boost::posix_time::microsec_clock::universal_time() );

template <typename T> std::shared_ptr<T> fetchPayload( const cond::Hash& payloadHash );
template <typename T> std::unique_ptr<T> fetchPayload( const cond::Hash& payloadHash );

cond::Hash storePayloadData( const std::string& payloadObjectType,
const std::pair<Binary,Binary>& payloadAndStreamerInfoData,
Expand Down Expand Up @@ -212,14 +212,14 @@ namespace cond {
return ret;
}

template <typename T> inline std::shared_ptr<T> Session::fetchPayload( const cond::Hash& payloadHash ){
template <typename T> inline std::unique_ptr<T> Session::fetchPayload( const cond::Hash& payloadHash ){
cond::Binary payloadData;
cond::Binary streamerInfoData;
std::string payloadType;
if(! fetchPayloadData( payloadHash, payloadType, payloadData, streamerInfoData ) )
throwException( "Payload with id "+payloadHash+" has not been found in the database.",
"Session::fetchPayload" );
std::shared_ptr<T> ret;
std::unique_ptr<T> ret;
try{
ret = deserialize<T>( payloadType, payloadData, streamerInfoData );
} catch ( const cond::persistency::Exception& e ){
Expand Down

0 comments on commit e0d834d

Please sign in to comment.